Skip to content

Commit

Permalink
fix: add back curl
Browse files Browse the repository at this point in the history
  • Loading branch information
rwaffen authored Oct 7, 2024
1 parent 8dd52b2 commit c40b6be
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
APK_JQ=${{ matrix.apk_jq }}
APK_YAMLLINT=${{ matrix.apk_yamllint }}
APK_GIT=${{ matrix.apk_git }}
APK_CURL=${{ matrix.apk_curl }}
build_arch: linux/amd64,linux/arm64
docker_username: voxpupulibot
docker_password: ${{ secrets.DOCKERHUB_BOT_PASSWORD }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
APK_JQ=${{ matrix.apk_jq }}
APK_YAMLLINT=${{ matrix.apk_yamllint }}
APK_GIT=${{ matrix.apk_git }}
APK_CURL=${{ matrix.apk_curl }}
- name: Clone voxpupuli/puppet-example repository
uses: actions/checkout@v4
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ ARG BASE_IMAGE=docker.io/ruby:3.2.5-alpine3.20

FROM $BASE_IMAGE AS builder

# Gems have to be ARG and ENV because they are used as reference in the Gemfile
ARG RUBYGEM_PUPPET
ENV RUBYGEM_PUPPET ${RUBYGEM_PUPPET:-8.8.1}

Expand Down Expand Up @@ -71,15 +72,18 @@ LABEL org.label-schema.maintainer="Voxpupuli Team <voxpupuli@groups.io>" \
org.label-schema.schema-version="1.0" \
org.label-schema.dockerfile="/Dockerfile"

# APKs are not used in any other file, so ARG is sufficient.
ARG APK_JQ=1.7.1-r0
ARG APK_YAMLLINT=1.35.1-r1
ARG APK_GIT=2.45.2-r0
ARG APK_CURL=8.10.1-r0

RUN apk update \
&& apk upgrade \
&& apk add jq=${APK_JQ} \
&& apk add yamllint=${APK_YAMLLINT} \
&& apk add git=${APK_GIT} \
&& apk add curl=${APK_CURL} \
&& rm -rf /var/cache/apk/* \
&& rm -rf /usr/local/lib/ruby/gems

Expand Down
6 changes: 4 additions & 2 deletions build_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"rubygem_bundler": "2.4.22",
"apk_jq": "1.6-r1",
"apk_yamllint": "1.26.3-r1",
"apk_git": "2.36.6-r0"
"apk_git": "2.36.6-r0",
"apk_curl": "8.5.0-r0"
},
{
"puppet_release": 8,
Expand All @@ -36,7 +37,8 @@
"rubygem_bundler": "2.5.18",
"apk_jq": "1.7.1-r0",
"apk_yamllint": "1.35.1-r1",
"apk_git": "2.45.2-r0"
"apk_git": "2.45.2-r0",
"apk_curl": "8.10.1-r0"
}
]
}

0 comments on commit c40b6be

Please sign in to comment.