From 24e83134278f5d114f9116d35138a1212ff6c2de Mon Sep 17 00:00:00 2001 From: Jusong Yu Date: Tue, 11 Jul 2023 00:48:31 +0200 Subject: [PATCH] full build for non-base images --- docker-bake.hcl | 5 ----- stack/base-with-services/Dockerfile | 4 +--- stack/full-stack/Dockerfile | 5 ++--- stack/lab/Dockerfile | 4 +--- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index aa60c2dc..f4aa2431 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -33,11 +33,6 @@ variable "PLATFORMS" { default = ["linux/amd64"] } -function "arch2platform" { - params = [arch] - result = "linux/${arch}" -} - variable "TARGETS" { default = ["base", "base-with-services", "lab", "full-stack"] } diff --git a/stack/base-with-services/Dockerfile b/stack/base-with-services/Dockerfile index 36a8a98d..1a987e63 100644 --- a/stack/base-with-services/Dockerfile +++ b/stack/base-with-services/Dockerfile @@ -1,7 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OWNER=aiidalab -ARG BASE_CONTAINER=$OWNER/base -FROM $BASE_CONTAINER +FROM base LABEL maintainer="AiiDAlab Team " diff --git a/stack/full-stack/Dockerfile b/stack/full-stack/Dockerfile index 300a2cb6..2a39b0ec 100644 --- a/stack/full-stack/Dockerfile +++ b/stack/full-stack/Dockerfile @@ -1,8 +1,7 @@ # syntax=docker/dockerfile:1 -ARG OWNER=aiidalab -FROM $OWNER/base-with-services as base +FROM base-with-services as base -FROM $OWNER/lab +FROM lab USER root diff --git a/stack/lab/Dockerfile b/stack/lab/Dockerfile index 41a29fdb..6c846483 100644 --- a/stack/lab/Dockerfile +++ b/stack/lab/Dockerfile @@ -1,7 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OWNER=aiidalab -ARG BASE_CONTAINER=$OWNER/base -FROM $BASE_CONTAINER +FROM base LABEL maintainer="AiiDAlab Team "