Skip to content

Commit

Permalink
Update base image
Browse files Browse the repository at this point in the history
Signed-off-by: kouki <[email protected]>
  • Loading branch information
kmdkuk committed Nov 13, 2023
1 parent 969fed2 commit b37489d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion argocd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN chmod +x /usr/local/bin/tini-static
# We cannot use Ubuntu 22.04 (jammy) image because the combination of
# jammy and Node.js v12 is not provided by the NodeSource Node.js Binary
# Distributions.
FROM quay.io/cybozu/golang:1.20-focal AS argocd-build
FROM quay.io/cybozu/golang:1.21-focal AS argocd-build
ENV ARGOCD_VERSION=2.8.6
ENV PACKAGE=github.com/argoproj/argo-cd

Expand Down
4 changes: 2 additions & 2 deletions dex/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# dex container image

# Stage1: build from source
FROM quay.io/cybozu/golang:1.21-focal AS build
FROM quay.io/cybozu/golang:1.21-jammy AS build

ARG DEX_VERSION=2.37.0

Expand All @@ -13,7 +13,7 @@ RUN curl -sSLf https://github.com/dexidp/dex/archive/v${DEX_VERSION}.tar.gz | \
RUN make bin/dex VERSION=v${DEX_VERSION}

# Stage2: setup runtime container
FROM quay.io/cybozu/ubuntu:20.04
FROM quay.io/cybozu/ubuntu:22.04

COPY --from=build /work/dex/bin/dex /usr/local/bin/dex
COPY --from=build /work/dex/LICENSE /usr/local/share/doc/dex/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion haproxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ENV DEBIAN_FRONTEND noninteractive

RUN mkdir -p /var/lib/haproxy && \
mkdir -p /usr/local/haproxy && \
mkdir -p /usr/local/bin
mkdir -p /usr/local/bin

COPY --from=build /usr/local/sbin/haproxy /usr/local/bin/haproxy
COPY --from=build /tmp/haproxy/examples/errorfiles /usr/etc/haproxy/errors
Expand Down

0 comments on commit b37489d

Please sign in to comment.