Skip to content

Commit bbbdbb6

Browse files
committed
Added building for armhf
1 parent be72198 commit bbbdbb6

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# Base image
33
# @see https://hub.docker.com/_/alpine/
44
#
5-
FROM alpine:3.10
5+
ARG BASE_IMAGE
6+
FROM ${BASE_IMAGE}
67

78
#
89
# Arguments
@@ -12,7 +13,7 @@ ARG VCS_REF
1213
ARG VCS_SRC
1314
ARG VERSION
1415
ARG OVERLAY_VERSION="v1.22.1.0"
15-
ARG OVERLAY_ARCH="amd64"
16+
ARG OVERLAY_ARCH
1617

1718
#
1819
# Labels
@@ -59,6 +60,11 @@ RUN apk add --no-cache \
5960
#
6061
RUN useradd -u 1000 -U -d /config -s /bin/false abc
6162

63+
#
64+
# Add QEMU for running arm images on amd64
65+
#
66+
COPY ./bin/qemu-arm-static /usr/bin/qemu-arm-static
67+
6268
#
6369
# Install s6-overlay
6470
# @see https://github.com/just-containers/s6-overlay

bin/qemu-arm-static

3.82 MB
Binary file not shown.

hooks/build

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,22 @@
66
# @see https://microbadger.com/labels
77
#
88

9-
echo "Building image"
9+
echo "Building images"
1010

1111
docker build \
12+
--build-arg BASE_IMAGE="alpine:3.10" \
1213
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
14+
--build-arg OVERLAY_ARCH="amd64" \
1315
--build-arg VCS_REF=`git rev-parse --short HEAD` \
1416
--build-arg VCS_SRC="https://github.com/SloCompTech/docker-openvpn/commit/$SOURCE_COMMIT" \
1517
--build-arg VERSION="$SOURCE_BRANCH" \
16-
-t $IMAGE_NAME .
18+
-t $IMAGE_NAME .
19+
20+
docker build \
21+
--build-arg BASE_IMAGE="arm32v6/alpine:3.10" \
22+
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
23+
--build-arg OVERLAY_ARCH="armhf" \
24+
--build-arg VCS_REF=`git rev-parse --short HEAD` \
25+
--build-arg VCS_SRC="https://github.com/SloCompTech/docker-openvpn/commit/$SOURCE_COMMIT" \
26+
--build-arg VERSION="$SOURCE_BRANCH" \
27+
-t $IMAGE_NAME-armhf .

0 commit comments

Comments
 (0)