Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert: "chore(ci): revert: Use DOCKER_REGISTRY, and compat" (#17057)" #17070

Merged
merged 2 commits into from
Nov 28, 2024
Merged

revert: "chore(ci): revert: Use DOCKER_REGISTRY, and compat" (#17057)" #17070

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72fd33a
Revert "chore(ci): revert: Use `DOCKER_REGISTRY`, and compat" (#17057)"
AndesKrrrrrrrrrrr Nov 28, 2024
724aae9
Merge branch 'main' into chore/dockerfile-compat
AndesKrrrrrrrrrrr Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions scripts/ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# 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_IMAGE_REGISTRY=public.ecr.aws
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 NODE_IMAGE_TAG

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

# hadolint ignore=DL3018
RUN apk add -U git
Expand Down Expand Up @@ -37,7 +40,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_IMAGE_REGISTRY}/docker/library/node:${NODE_IMAGE_TAG} AS output-base
FROM ${DOCKER_REGISTRY}/library/node:${NODE_IMAGE_TAG} AS output-base
ARG APP
ARG APP_HOME
ARG APP_DIST_HOME
Expand Down Expand Up @@ -85,7 +88,7 @@ LABEL branch=${GIT_BRANCH}
LABEL commit=${GIT_COMMIT_SHA}
ENTRYPOINT [ "node", "main.js" ]

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