container/alpine-s6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use new way to get architecture

Browse Source
This commit is contained in:
Sebastian Hugentobler 2023-12-12 23:43:00 +01:00
parent 7d2cc36d5f
commit cd164794ca
Signed by: shu
GPG Key ID: BB32CF3CA052C2F0
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitea/workflows/container.yaml
View File

@ -6,15 +6,13 @@ jobs:
steps: steps:
- name: Check out repository code - name: Check out repository code
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Build image - name: Build image
id: build-image id: build-image
uses: redhat-actions/buildah-build@v2 uses: redhat-actions/buildah-build@v2
with: with:
image: docker.io/thallian/alpine-s6 image: docker.io/thallian/alpine-s6
tags: ${{ gitea.ref_name }} ${{ gitea.sha }} latest tags: ${{ gitea.ref_name }} ${{ gitea.sha }} latest
archs: amd64 archs: amd64, arm64
containerfiles: | containerfiles: |
./Containerfile ./Containerfile
- name: Log in to Dockerhub - name: Log in to Dockerhub

6
Containerfile
View File

@ -1,8 +1,6 @@
FROM docker.io/alpine:3.19 AS builder FROM docker.io/alpine:3.19 AS builder
LABEL maintainer="Sebastian Hugentobler <sebastian@vanwa.ch>" LABEL maintainer="Sebastian Hugentobler <sebastian@vanwa.ch>"
ARG TARGET_ARCH=x86_64
ENV S6_OVERLAY_VERSION=v3.1.6.2 ENV S6_OVERLAY_VERSION=v3.1.6.2
RUN apk --no-cache add \ RUN apk --no-cache add \
@ -16,8 +14,8 @@ RUN git clone https://github.com/just-containers/s6-overlay.git /src
WORKDIR /src WORKDIR /src
RUN git checkout "$S6_OVERLAY_VERSION" RUN git checkout "$S6_OVERLAY_VERSION"
RUN make ARCH=$TARGET_ARCH-linux-musl -j4 RUN make ARCH=$(arch)-linux-musl -j4
RUN mv /src/output/rootfs-overlay-${TARGET_ARCH}-linux-musl /src/output/rootfs-overlay-arch RUN mv /src/output/rootfs-overlay-$(arch)-linux-musl /src/output/rootfs-overlay-arch
FROM docker.io/alpine:3.19 FROM docker.io/alpine:3.19