Skip to content

Commit

Permalink
Revert "chore(ci): Use DOCKER_REGISTRY, and compat (#17051)"
Browse files Browse the repository at this point in the history
This reverts commit c2dc471.
  • Loading branch information
busla authored Nov 27, 2024
1 parent c2dc471 commit 370cae8
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions scripts/ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
# This is a multi-stage Dockerfile which contains all CI-related operations as well as images to be deployed in production
ARG PLAYWRIGHT_VERSION
ARG DOCKER_ECR_REGISTRY=public.ecr.aws/docker
ARG DOCKER_IMAGE_REGISTRY=${DOCKER_ECR_REGISTRY%/docker}
# Alias DOCKER_IMAGE_REGISTRY to DOCKER_REGISTRY for backwards compatibility
ARG DOCKER_REGISTRY=${DOCKER_IMAGE_REGISTRY}/docker
ARG DOCKER_IMAGE_REGISTRY=public.ecr.aws
ARG NODE_IMAGE_TAG

FROM ${DOCKER_REGISTRY}/library/node:${NODE_IMAGE_TAG} AS deps
FROM ${DOCKER_IMAGE_REGISTRY}/docker/library/node:${NODE_IMAGE_TAG} AS deps

# hadolint ignore=DL3018
RUN apk add -U git
Expand Down Expand Up @@ -40,7 +37,7 @@ ENV NODE_OPTIONS="--max-old-space-size=8192"
RUN yarn run build ${APP} --prod

# This is base image for containers that are to be deployed
FROM ${DOCKER_REGISTRY}/library/node:${NODE_IMAGE_TAG} AS output-base
FROM ${DOCKER_IMAGE_REGISTRY}/docker/library/node:${NODE_IMAGE_TAG} AS output-base
ARG APP
ARG APP_HOME
ARG APP_DIST_HOME
Expand Down Expand Up @@ -88,7 +85,7 @@ LABEL branch=${GIT_BRANCH}
LABEL commit=${GIT_COMMIT_SHA}
ENTRYPOINT [ "node", "main.js" ]

FROM ${DOCKER_REGISTRY}/nginx/nginx:1.21-alpine AS output-static
FROM ${DOCKER_IMAGE_REGISTRY}/nginx/nginx:1.21-alpine AS output-static
ARG APP
ARG APP_DIST_HOME
ENV APP=${APP}
Expand Down

0 comments on commit 370cae8

Please sign in to comment.