full build for non-base images

unkcpz · unkcpz · commit 24e83134278f · 2023-07-11T01:01:42.000+02:00
diff --git 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
@@ -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 <aiidalab@materialscloud.org>"
 
diff --git 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
@@ -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 <aiidalab@materialscloud.org>"
 

Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,6 @@ variable "PLATFORMS" {`
`33`	`33`	`default = ["linux/amd64"]`
`34`	`34`	`}`
`35`	`35`
`36`		`-function "arch2platform" {`
`37`		`- params = [arch]`
`38`		`- result = "linux/${arch}"`
`39`		`-}`
`40`		`-`
`41`	`36`	`variable "TARGETS" {`
`42`	`37`	`default = ["base", "base-with-services", "lab", "full-stack"]`
`43`	`38`	`}`