Skip to content

Commit

Permalink
Merge pull request #1822 from OpenC3/traefik
Browse files Browse the repository at this point in the history
Parameterize the traefik version and bump to 3.3.2
  • Loading branch information
jmthomas authored Jan 15, 2025
2 parents e319cdb + 06135d7 commit 8e78a6c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
1 change: 1 addition & 0 deletions openc3-minio/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ARG OPENC3_DEPENDENCY_REGISTRY=docker.io
# Consider updating openc3_build_ubi.sh when changing the release version
ARG OPENC3_MINIO_RELEASE=RELEASE.2024-12-18T13-15-44Z
FROM ${OPENC3_DEPENDENCY_REGISTRY}/minio/minio:${OPENC3_MINIO_RELEASE}

Expand Down
4 changes: 3 additions & 1 deletion openc3-traefik/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
ARG OPENC3_DEPENDENCY_REGISTRY=docker.io
ARG TRAEFIK_CONFIG=traefik.yaml
FROM ${OPENC3_DEPENDENCY_REGISTRY}/traefik:v3.2.3
# Consider updating openc3_build_ubi.sh when changing the release version
ARG OPENC3_TRAEFIK_RELEASE=v3.3.2
FROM ${OPENC3_DEPENDENCY_REGISTRY}/traefik:${OPENC3_TRAEFIK_RELEASE}

# An ARG declared before a FROM is outside of a build stage, so it can’t be
# used in any instruction after a FROM. So we need to re-ARG.
Expand Down
5 changes: 5 additions & 0 deletions scripts/linux/openc3_build_ubi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ docker build \
cd ..

# openc3-minio
# NOTE: Ensure the release is on IronBank:
# https://ironbank.dso.mil/repomap/details;registry1Path=opensource%252Fminio%252Fminio
# NOTE: RELEASE.2023-10-16T04-13-43Z is the last MINIO release to support UBI8
cd openc3-minio
docker build \
Expand Down Expand Up @@ -128,11 +130,14 @@ cd ..
if [[ -z $TRAEFIK_CONFIG ]]; then
export TRAEFIK_CONFIG=traefik.yaml
fi
# NOTE: Ensure OPENC3_TRAEFIK_RELEASE is on IronBank:
# https://ironbank.dso.mil/repomap/details;registry1Path=opensource%252Ftraefik%252Ftraefik
cd openc3-traefik
docker build \
--network host \
--build-arg OPENC3_DEPENDENCY_REGISTRY=${OPENC3_UBI_REGISTRY}/ironbank/opensource/traefik \
--build-arg TRAEFIK_CONFIG=$TRAEFIK_CONFIG \
--build-arg OPENC3_TRAEFIK_RELEASE=v3.3.2 \
--platform linux/amd64 \
-t "${OPENC3_REGISTRY}/${OPENC3_NAMESPACE}/openc3-traefik-ubi:${OPENC3_TAG}" \
.
Expand Down

0 comments on commit 8e78a6c

Please sign in to comment.