From 178be9364c34f6348b245562befe1c968a2a5d9e Mon Sep 17 00:00:00 2001 From: Matthias Hertel Date: Thu, 5 Oct 2023 11:59:23 +0200 Subject: [PATCH] Removed static base image name from licensed image docker build --- .github/workflows/licensed_image_build.yml | 2 ++ docker_base/Dockerfile | 2 +- docker_licensed/Dockerfile | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/licensed_image_build.yml b/.github/workflows/licensed_image_build.yml index 9444245..9dbe19a 100644 --- a/.github/workflows/licensed_image_build.yml +++ b/.github/workflows/licensed_image_build.yml @@ -55,4 +55,6 @@ jobs: with: context: ./docker_licensed push: true + build-args: | + BASE_IMAGE=ghcr.io/${{ env.REPO_SLUG }}/arm-mlops-docker-base:latest tags: ghcr.io/${{ env.REPO_SLUG }}/arm-mlops-docker-licensed:latest diff --git a/docker_base/Dockerfile b/docker_base/Dockerfile index 69a542d..90580cb 100644 --- a/docker_base/Dockerfile +++ b/docker_base/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:latest as base +FROM --platform=linux/amd64 ubuntu:latest as base RUN apt-get update && apt-get install -y wget sudo software-properties-common && rm -rf /var/lib/apt/lists/* diff --git a/docker_licensed/Dockerfile b/docker_licensed/Dockerfile index a712d43..2ada5ed 100644 --- a/docker_licensed/Dockerfile +++ b/docker_licensed/Dockerfile @@ -1,4 +1,5 @@ -FROM ghcr.io/arm-software/avh-mlops/arm-mlops-docker-base:latest as base +ARG BASE_IMAGE +FROM ${BASE_IMAGE} as base ADD arm_mlops_docker_license /arm_mlops_docker_license RUN su -l arm_mlops_docker -c "/home/arm_mlops_docker/ArmCompilerforEmbedded6.20/bin/armlm import --file /arm_mlops_docker_license"