Skip to content

Commit

Permalink
Bump Alpine
Browse files Browse the repository at this point in the history
Signed-off-by: Guilherme Macedo <[email protected]>
  • Loading branch information
macedogm authored and brandond committed Aug 12, 2024
1 parent e832c67 commit dffa07e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
17 changes: 11 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
ARG ALPINE=alpine:3.17.2
ARG ALPINE=alpine:3.20
FROM ${ALPINE} AS verify
ARG ARCH
ARG TAG
WORKDIR /verify
ADD https://github.com/k3s-io/k3s/releases/download/${TAG}/sha256sum-${ARCH}.txt .
RUN set -x \
&& apk --no-cache add \
curl \
file
&& apk upgrade -U \
&& apk add \
curl file \
&& apk cache clean \
&& rm -rf /var/cache/apk/*
RUN if [ "${ARCH}" == "amd64" ]; then \
export ARTIFACT="k3s"; \
elif [ "${ARCH}" == "arm" ]; then \
Expand All @@ -26,8 +28,11 @@ RUN if [ "${ARCH}" == "amd64" ]; then \
FROM ${ALPINE}
ARG ARCH
ARG TAG
RUN apk --no-cache add \
jq libselinux-utils procps
RUN apk upgrade -U \
&& apk add \
jq libselinux-utils procps \
&& apk cache clean \
&& rm -rf /var/cache/apk/*
COPY --from=verify /opt/k3s /opt/k3s
COPY scripts/upgrade.sh /bin/upgrade.sh
ENTRYPOINT ["/bin/upgrade.sh"]
Expand Down
6 changes: 5 additions & 1 deletion Dockerfile.manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.18.4
FROM alpine:3.20

COPY --from=plugins/manifest:1.2.3 /bin/* /bin/

Expand All @@ -11,6 +11,10 @@ ENV DOCKER_PASSWORD $DOCKER_PASSWORD
ARG DRONE_TAG
ENV DRONE_TAG $DRONE_TAG

RUN apk upgrade -U \
&& apk cache clean \
&& rm -rf /var/cache/apk/*

COPY ./scripts/manifest /bin/

RUN manifest

0 comments on commit dffa07e

Please sign in to comment.