Skip to content
This repository was archived by the owner on Feb 11, 2025. It is now read-only.

Commit 975dccf

Browse files
eksrhaeksrha
authored
Merge pull request #14 from fullstack-devops/bugfix/fix-skopeo-version
add skopeo version v1.7.0
2 parents 2f011e5 + 46a8468 commit 975dccf

File tree

4 files changed

+26
-17
lines changed

4 files changed

+26
-17
lines changed

‎.github/workflows/build-pr.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
- name: Set up QEMU
3030
uses: docker/setup-qemu-action@v1
3131
- name: Set up Docker Buildx
32+
id: buildx
3233
uses: docker/setup-buildx-action@v1
3334

3435
- name: Build github-actions-runner:base
@@ -49,7 +50,7 @@ jobs:
4950
5051
- name: link child image to current pr
5152
run: |
52-
sed -i --expression "s@FROM.*@FROM ${{ env.IMAGE_BASE }}:base-pr-${{ github.event.pull_request.number }}@g" \
53+
sed -i --expression "s@FROM ${{ env.IMAGE_BASE }}.*@FROM ${{ env.IMAGE_BASE }}:base-pr-${{ github.event.pull_request.number }}@g" \
5354
images/ansible-k8s/Dockerfile \
5455
images/fullstacked/Dockerfile
5556

‎.github/workflows/create-release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
push: true
4545
tags: |
4646
${{ env.IMAGE_BASE }}:latest
47-
${{ env.IMAGE_BASE }}:base-latest
47+
${{ env.IMAGE_BASE }}:latest-base
4848
${{ env.IMAGE_BASE }}:${{needs.create_release.outputs.version}}-base
4949
5050
- name: Build github-actions-runner:kaniko-sidecar
@@ -53,12 +53,12 @@ jobs:
5353
context: ./images/kaniko-sidecar
5454
push: true
5555
tags: |
56-
${{ env.IMAGE_BASE }}:kaniko-sidecar-latest
56+
${{ env.IMAGE_BASE }}:latest-kaniko-sidecar
5757
${{ env.IMAGE_BASE }}:${{needs.create_release.outputs.version}}-kaniko-sidecar
5858
5959
- name: link child image to current version
6060
run: |
61-
sed -i --expression "s@FROM.*@FROM ${{ env.IMAGE_BASE }}:${{needs.create_release.outputs.version}}-base@g" \
61+
sed -i --expression "s@FROM ${{ env.IMAGE_BASE }}.*@FROM ${{ env.IMAGE_BASE }}:${{needs.create_release.outputs.version}}-base@g" \
6262
images/ansible-k8s/Dockerfile \
6363
images/fullstacked/Dockerfile
6464
@@ -68,7 +68,7 @@ jobs:
6868
context: ./images/ansible-k8s
6969
push: true
7070
tags: |
71-
${{ env.IMAGE_BASE }}:ansible-k8s-latest
71+
${{ env.IMAGE_BASE }}:latest-ansible-k8s
7272
${{ env.IMAGE_BASE }}:${{needs.create_release.outputs.version}}-ansible-k8s
7373
7474
- name: Build github-actions-runner:fullstacked
@@ -77,7 +77,7 @@ jobs:
7777
context: ./images/fullstacked
7878
push: true
7979
tags: |
80-
${{ env.IMAGE_BASE }}:fullstacked-latest
80+
${{ env.IMAGE_BASE }}:latest-fullstacked
8181
${{ env.IMAGE_BASE }}:${{needs.create_release.outputs.version}}-fullstacked
8282
8383
publish_release:

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Package / Images: ghcr.io/fullstack-devops/github-actions-runner
1111
Available Tags:
1212
| Name (tag) | Installed Tools/ Software | Description |
1313
|-------------------------|-----------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------|
14-
| `base-latest` | libffi-dev, libicu-dev, build-essential, libssl-dev, ca-certificates, jq, sed, grep, git, curl, wget, zip | Base runner with nothing fancy installed <br> [Dockerfile](images/base/Dockerfile) |
15-
| `kaniko-sidecar-latest` | kaniko | Sidecar used by other runner images to build containers without root privileges |
16-
| `ansible-k8s-latest` | base-image + ansible, helm, kubectl | Runner specialized for automated k8s deployments via ansible <br> For more Details see [Dockerfile](images/ansible-k8s/Dockerfile) |
17-
| `fullstacked-latest` | base-image + maven, openjdk-11, nodejs, go, yarn, angular/cli, helm | Runner with a bunch of tools to build your hole application<br> For more Details see [Dockerfile](images/fullstacked/Dockerfile) |
14+
| `latest-base` | libffi-dev, libicu-dev, build-essential, libssl-dev, ca-certificates, jq, sed, grep, git, curl, wget, zip | Base runner with nothing fancy installed <br> [Dockerfile](images/base/Dockerfile) |
15+
| `latest-kaniko-sidecar` | kaniko | Sidecar used by other runner images to build containers without root privileges |
16+
| `latest-ansible-k8s` | base-image + ansible, helm, kubectl, skopeo | Runner specialized for automated k8s deployments via ansible <br> For more Details see [Dockerfile](images/ansible-k8s/Dockerfile) |
17+
| `latest-fullstacked` | base-image + maven, openjdk-11, nodejs, go, yarn, angular/cli, helm | Runner with a bunch of tools to build your hole application<br> For more Details see [Dockerfile](images/fullstacked/Dockerfile) |
1818

1919
> Hint: `latest can be replaced with an spezfic release version for more stability`
2020
@@ -100,15 +100,15 @@ spec:
100100
emptyDir: {}
101101
containers:
102102
- name: kaniko
103-
image: ghcr.io/fullstack-devops/github-actions-runner:kaniko-sidecar-latest
103+
image: ghcr.io/fullstack-devops/github-actions-runner:latest-kaniko-sidecar
104104
resources: {}
105105
volumeMounts:
106106
- name: workspace-volume
107107
mountPath: /kaniko/workspace/
108108
imagePullPolicy: IfNotPresent
109109
tty: true
110110
- name: github-actions-runner
111-
image: ghcr.io/fullstack-devops/github-actions-runner:base-latest
111+
image: ghcr.io/fullstack-devops/github-actions-runner:latest-base
112112
resources: {}
113113
env:
114114
- name: GH_ORG

‎images/ansible-k8s/Dockerfile‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
1-
FROM ghcr.io/fullstack-devops/github-actions-runner:base-latest
1+
FROM golang:1.16 AS build
2+
WORKDIR $GOPATH/src/github.com/containers/skopeo
3+
ENV CGO_ENABLED=0
4+
ENV BUILDTAGS=containers_image_openpgp
5+
ENV DISABLE_DOCS=1
6+
RUN git clone https://github.com/containers/skopeo $GOPATH/src/github.com/containers/skopeo
7+
RUN git checkout tags/v1.7.0
8+
RUN make bin/skopeo
9+
10+
FROM ghcr.io/fullstack-devops/github-actions-runner:latest-base
211

312
USER root
413
# install packages along with jq so we can parse JSON
514
# add additional packages as necessary
6-
ARG PACKAGES="ansible skopeo"
15+
ARG PACKAGES="ansible"
716
ARG PACKAGES_PYTHON="kubernetes"
817

9-
RUN echo "deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${UBUNTU_VERSION}/ /" | tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
10-
RUN curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_${UBUNTU_VERSION}/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_stable.gpg > /dev/null
11-
1218
RUN apt-get update \
1319
&& apt-get install -y --no-install-recommends ${PACKAGES} \
1420
&& rm -rf /var/lib/apt/lists/* \
@@ -20,6 +26,8 @@ ARG KUBECTL_VERSION=1.23.5
2026
# https://github.com/helm/helm/releases
2127
ARG HELM_VERSION=3.8.1
2228

29+
COPY --from=build /go/src/github.com/containers/skopeo/bin/skopeo /usr/local/bin/skopeo
30+
2331
# Install kubectl
2432
RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short) \
2533
&& wget -q https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/${ARCH}/kubectl -O /usr/local/bin/kubectl \

0 commit comments

Comments
 (0)