Commit 65551243 authored by ayiniho's avatar ayiniho
Browse files

Revert "update Dockerfile to alpine 3.14.3"

This reverts commit 69dc7eb2
parent 2af998e9
Pipeline #8747 passed with stage
in 11 minutes and 4 seconds
# First stage to build assets
<<<<<<< HEAD
ARG DISTRO=alpine:3.14.5
=======
ARG DISTRO=alpine:3.14.3
>>>>>>> update Dockerfile to alpine 3.14.3
ARG ARCH=""
FROM ${ARCH}node:16 as assets
......
<<<<<<< HEAD
ARG DISTRO=alpine:3.14.5
=======
ARG DISTRO=alpine:3.14.3
>>>>>>> update Dockerfile to alpine 3.14.3
FROM $DISTRO
ARG VERSION
......
<<<<<<< HEAD
ARG DISTRO=alpine:3.14.5
=======
ARG DISTRO=alpine:3.14.3
>>>>>>> update Dockerfile to alpine 3.14.3
FROM $DISTRO
ARG VERSION
......
# This is an idle image to dynamically replace any component if disabled.
<<<<<<< HEAD
ARG DISTRO=alpine:3.14.5
=======
ARG DISTRO=alpine:3.14.3
>>>>>>> update Dockerfile to alpine 3.14.3
FROM $DISTRO
CMD sleep 1000000d
<<<<<<< HEAD
ARG DISTRO=alpine:3.14.5
=======
ARG DISTRO=alpine:3.14.3
>>>>>>> update Dockerfile to alpine 3.14.3
FROM $DISTRO
ARG VERSION
......
<<<<<<< HEAD
ARG DISTRO=alpine:3.14.5
=======
ARG DISTRO=alpine:3.14.3
>>>>>>> update Dockerfile to alpine 3.14.3
FROM $DISTRO
ARG VERSION
......
<<<<<<< HEAD
ARG DISTRO=alpine:3.14.5
=======
ARG DISTRO=alpine:3.14.3
>>>>>>> update Dockerfile to alpine 3.14.3
FROM $DISTRO
ARG VERSION
......
<<<<<<< HEAD
ARG DISTRO=alpine:3.14.5
=======
ARG DISTRO=alpine:3.14.3
>>>>>>> update Dockerfile to alpine 3.14.3
FROM $DISTRO
ARG VERSION
......
<<<<<<< HEAD
ARG DISTRO=alpine:3.14.5
=======
ARG DISTRO=alpine:3.14.3
>>>>>>> update Dockerfile to alpine 3.14.3
FROM $DISTRO
ARG VERSION
......
<<<<<<< HEAD
ARG DISTRO=alpine:3.14.5
=======
ARG DISTRO=alpine:3.14.3
>>>>>>> update Dockerfile to alpine 3.14.3
FROM $DISTRO
ARG VERSION
ENV TZ Etc/UTC
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment