From 4a97a705a0606b7a8b5f36dd259a40989c18c821 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Sun, 3 Oct 2021 00:52:08 +0200
Subject: ci/formal: use pkg containers from hdl/containers

---
 ci.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/ci.sh b/ci.sh
index a52b514..a1cd8d1 100755
--- a/ci.sh
+++ b/ci.sh
@@ -51,10 +51,18 @@ do_formal () {
 
 gstart "[Build] ghdl/synth:formal" "$ANSI_MAGENTA"
 docker build -t ghdl/synth:formal . -f- <<-EOF
-FROM hdlc/ghdl:yosys
+ARG REGISTRY='gcr.io/hdl-containers/debian/bullseye'
 
-COPY --from=hdlc/pkg:z3 /z3 /
-COPY --from=hdlc/pkg:symbiyosys /symbiyosys /
+#--
+
+# WORKAROUND: this is required because 'COPY --from' does not support ARGs
+FROM \$REGISTRY/pkg/z3 AS pkg-z3
+FROM \$REGISTRY/pkg/symbiyosys AS pkg-symbiyosys
+
+FROM ghdl/synth:beta
+
+COPY --from=pkg-z3 /z3 /
+COPY --from=pkg-symbiyosys /symbiyosys /
 
 RUN apt-get update -qq \
  && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
-- 
cgit v1.2.3