From 599654e8049081e94819cda23a1d4eaaadfecce8 Mon Sep 17 00:00:00 2001 From: Reuben Miller Date: Fri, 16 Feb 2024 15:41:19 +0100 Subject: [PATCH] feat: use debian as base image to potentially support armv7 and armv6 --- .github/workflows/publish.yaml | 2 +- containers/opcua-device-gateway/Dockerfile | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 013a047..da6e110 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -50,7 +50,7 @@ jobs: with: context: containers/opcua-device-gateway push: ${{ github.event_name != 'pull_request' }} - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} build-args: | diff --git a/containers/opcua-device-gateway/Dockerfile b/containers/opcua-device-gateway/Dockerfile index e0f07a6..a48b6e4 100644 --- a/containers/opcua-device-gateway/Dockerfile +++ b/containers/opcua-device-gateway/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM debian:11-slim ARG BUILDTIME ARG REVISION @@ -15,14 +15,15 @@ LABEL org.opencontainers.image.vendor="thin-edge.io" LABEL org.opencontainers.image.licenses="Apache 2.0" LABEL org.opencontainers.image.url="https://thin-edge.io" LABEL org.opencontainers.image.documentation="https://thin-edge.github.io/thin-edge.io/" -LABEL org.opencontainers.image.base.name="alpine:3.18" - -RUN apk update \ - && apk upgrade \ - && apk add --no-cache bash \ - && apk add --no-cache --virtual=build-dependencies unzip \ - && apk add --no-cache curl \ - && apk add --no-cache openjdk11 +LABEL org.opencontainers.image.base.name="debian:11-slim" + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + openjdk-11-jre \ + wget \ + bash \ + unzip \ + curl # Only install thin-edge.io to read the tedge config properties (see the entrypoint.sh) # TODO: In the future this coupling may be removed