Skip to content

Commit

Permalink
Merge pull request #7 from voxpupuli/unpin_git
Browse files Browse the repository at this point in the history
fix: remove APK_GIT references from workflows and documentation
  • Loading branch information
rwaffen authored Dec 9, 2024
2 parents 7f186d2 + 8353e85 commit eafd1a0
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 7 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ jobs:
build_args: |
RUBYGEM_R10K=${{ matrix.rubygem_r10k }}
RUBYGEM_PUPPET=${{ matrix.rubygem_puppet }}
APK_GIT=${{ matrix.apk_git }}
build_arch: linux/amd64,linux/arm64
docker_username: voxpupulibot
docker_password: ${{ secrets.DOCKERHUB_BOT_PASSWORD }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ jobs:
build-args: |
RUBYGEM_R10K=${{ matrix.rubygem_r10k }}
RUBYGEM_PUPPET=${{ matrix.rubygem_puppet }}
APK_GIT=${{ matrix.apk_git }}
- name: Test container
run: docker run --rm ci/r10k:${{ matrix.rubygem_r10k }} deploy environment -mv
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FROM alpine:3.20

ARG APK_GIT=2.45.2-r0
ARG RUBYGEM_R10K=5.0.0
ARG RUBYGEM_PUPPET=8.10.0

Expand Down Expand Up @@ -28,7 +27,7 @@ RUN apk update \
&& apk add --no-cache \
bash \
gcc \
git=${APK_GIT} \
git \
libssh2 \
make \
musl-dev \
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ services:

| Name | Description |
| ---- | ------------|
|`APK_GIT`| The git version to install |
|`RUBYGEM_R10K`| The r10k version to install |
|`RUBYGEM_PUPPET`| The puppet version to install |
|`PUPPET_CONTROL_REPO` | The control repo url to get the Puppetfile from. Defaults to https://github.com/voxpupuli/controlrepo.git |
Expand Down
3 changes: 1 addition & 2 deletions build_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"include": [
{
"rubygem_r10k": "5.0.0",
"rubygem_puppet": "8.10.0",
"apk_git": "2.45.2-r0"
"rubygem_puppet": "8.10.0"
}
]
}

0 comments on commit eafd1a0

Please sign in to comment.