Skip to content

Commit

Permalink
Allow to add image prefix during image build (#322)
Browse files Browse the repository at this point in the history
Signed-off-by: Igor Shishkin <[email protected]>
  • Loading branch information
teran authored Feb 2, 2025
1 parent ccc539c commit 8d72fa0
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 10 deletions.
7 changes: 7 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ services:
build:
context: .
dockerfile: dockerfiles/Dockerfile.migrator
args:
ALPINE_IMAGE: ${IMAGE_PREFIX:-}index.docker.io/library/alpine:3.20.3
image: ${IMAGE_PREFIX:-}ghcr.io/teran/archived/migrator:latest
environment:
LOG_LEVEL: trace
Expand All @@ -47,6 +49,9 @@ services:
build:
context: .
dockerfile: dockerfiles/Dockerfile.publisher
args:
ALPINE_IMAGE: ${IMAGE_PREFIX:-}index.docker.io/library/alpine:3.20.3
ARG NODE_IMAGE: ${IMAGE_PREFIX:-}index.docker.io/library/node:22.12.0
image: ${IMAGE_PREFIX:-}ghcr.io/teran/archived/publisher:latest
environment:
LOG_LEVEL: trace
Expand All @@ -67,6 +72,8 @@ services:
build:
context: .
dockerfile: dockerfiles/Dockerfile.manager
args:
ALPINE_IMAGE: ${IMAGE_PREFIX:-}index.docker.io/library/alpine:3.20.3
image: ${IMAGE_PREFIX:-}ghcr.io/teran/archived/manager:latest
environment:
LOG_LEVEL: trace
Expand Down
5 changes: 4 additions & 1 deletion dockerfiles/Dockerfile.cli
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
FROM alpine:3.20.3 AS certificates
ARG ALPINE_IMAGE=index.docker.io/library/alpine:3.20.3

# hadolint ignore=DL3006
FROM ${ALPINE_IMAGE} AS certificates

RUN apk add --update --no-cache \
ca-certificates=20241121-r1
Expand Down
5 changes: 4 additions & 1 deletion dockerfiles/Dockerfile.exporter
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
FROM alpine:3.20.3 AS certificates
ARG ALPINE_IMAGE=index.docker.io/library/alpine:3.20.3

# hadolint ignore=DL3006
FROM ${ALPINE_IMAGE} AS certificates

RUN apk add --update --no-cache \
ca-certificates=20241121-r1
Expand Down
5 changes: 4 additions & 1 deletion dockerfiles/Dockerfile.gc
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
FROM alpine:3.20.3 AS certificates
ARG ALPINE_IMAGE=index.docker.io/library/alpine:3.20.3

# hadolint ignore=DL3006
FROM ${ALPINE_IMAGE} AS certificates

RUN apk add --update --no-cache \
ca-certificates=20241121-r1
Expand Down
5 changes: 4 additions & 1 deletion dockerfiles/Dockerfile.manager
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
FROM alpine:3.20.3 AS certificates
ARG ALPINE_IMAGE=index.docker.io/library/alpine:3.20.3

# hadolint ignore=DL3006
FROM ${ALPINE_IMAGE} AS certificates

RUN apk add --update --no-cache \
ca-certificates=20241121-r1
Expand Down
5 changes: 4 additions & 1 deletion dockerfiles/Dockerfile.migrator
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
FROM alpine:3.20.3 AS certificates
ARG ALPINE_IMAGE=index.docker.io/library/alpine:3.20.3

# hadolint ignore=DL3006
FROM ${ALPINE_IMAGE} AS certificates

RUN apk add --update --no-cache \
ca-certificates=20241121-r1
Expand Down
15 changes: 11 additions & 4 deletions dockerfiles/Dockerfile.publisher
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
FROM alpine:3.20.3 AS certificates
ARG ALPINE_IMAGE=index.docker.io/library/alpine:3.20.3
ARG NODE_IMAGE=index.docker.io/library/node:22.12.0

# hadolint ignore=DL3006
FROM ${ALPINE_IMAGE} AS certificates

RUN apk add --update --no-cache \
ca-certificates=20241121-r1

FROM index.docker.io/library/node:22.12.0 AS depsbuilder
# hadolint ignore=DL3006
FROM ${NODE_IMAGE} AS depsbuilder

RUN mkdir /src
WORKDIR /src
RUN npm install \
[email protected] \
[email protected]

FROM index.docker.io/library/node:22.12.0 AS tsbuilder
# hadolint ignore=DL3006
FROM ${NODE_IMAGE} AS tsbuilder

RUN mkdir /src
WORKDIR /src
Expand All @@ -20,7 +26,8 @@ RUN npm install -g \
COPY publisher/presenter/html/static/scripts /src/scripts
RUN tsc scripts/index.ts --strict --removeComments --outDir /build

FROM alpine:3.20.3 AS assets
# hadolint ignore=DL3006
FROM ${ALPINE_IMAGE} AS assets

RUN mkdir -p \
/static/archived/scripts \
Expand Down
5 changes: 4 additions & 1 deletion dockerfiles/Dockerfile.seeder
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
FROM alpine:3.20.3 AS certificates
ARG ALPINE_IMAGE=index.docker.io/library/alpine:3.20.3

# hadolint ignore=DL3006
FROM ${ALPINE_IMAGE} AS certificates

RUN apk add --update --no-cache \
ca-certificates=20241121-r1
Expand Down

0 comments on commit 8d72fa0

Please sign in to comment.