Remove OPENLANE_IMAGE_NAME from docker build and CI

.github/actions/set_env_variables/action.yml

@@ -14,7 +14,3 @@ runs:
     - name: Export Branch Name
       shell: bash
       run: echo "BRANCH_NAME=${GITHUB_REF##*/}" >> $GITHUB_ENV
-
-    - name: Export Temp Image Name
-      shell: bash
-      run: echo "OPENLANE_IMAGE_NAME=openlane:intermediate" >> $GITHUB_ENV

.github/scripts/gh.py

@@ -123,10 +123,6 @@ def export_env_alt(key, value):
         print('Environment variables required: "PDK_ROOT"')
         exit(os.EX_CONFIG)
 
-    if os.getenv("OPENLANE_IMAGE_NAME") is None:
-        print('Environment variables required: "OPENLANE_IMAGE_NAME"')
-        exit(os.EX_CONFIG)
-
 origin = os.getenv("REPO_URL")
 repo = Repo("Openlane", origin)
 
@@ -136,7 +132,6 @@ def export_env_alt(key, value):
         "run_id": os.getenv("GITHUB_RUN_ID"),
         "origin": origin,
         "branch": os.getenv("BRANCH_NAME"),
-        "image": os.getenv("OPENLANE_IMAGE_NAME"),
         "root": os.getenv("GITHUB_WORKSPACE"),
         "pdk_root": os.getenv("PDK_ROOT"),
         "pdk": os.getenv("PDK"),

.github/scripts/run_tests.py

@@ -53,7 +53,7 @@
     f"PDK_ROOT={gh.pdk_root}",
     "-e",
     f"PDK={gh.pdk}",
-    gh.image,
+    f"efabless/openlane2:current-amd64",
     "bash",
     "-c",
     shlex.join(

.github/workflows/openlane_ci.yml

@@ -231,7 +231,7 @@ jobs:
 
       - name: Run Test
         run: |
-          OPENLANE_IMAGE_NAME=$OPENLANE_IMAGE_NAME-amd64\
+          OPENLANE_IMAGE_NAME=efabless/openlane:current-amd64\
             python3 ${GITHUB_WORKSPACE}/.github/scripts/run_tests.py ${{ matrix.design.name }}
 
       - name: Escape Design Name
@@ -355,7 +355,7 @@ jobs:
         run: |
           for tag in $TAG_LIST; do
             for arch in amd64 arm64v8; do
-              docker image tag ${{ env.OPENLANE_IMAGE_NAME }}-$arch ${{ vars.DOCKER_IMAGE }}:$tag-$arch
+              docker image tag efabless/openlane:current-$arch ${{ vars.DOCKER_IMAGE }}:$tag-$arch
               docker push ${{ vars.DOCKER_IMAGE }}:$tag-$arch
             done
             docker manifest create ${{ vars.DOCKER_IMAGE }}:$tag\

Makefile

@@ -113,8 +113,9 @@ ENV_COMMAND = $(ENV_START) $(OPENLANE_IMAGE_NAME)-$(DOCKER_ARCH)
 all: get-openlane pdk
 
 .PHONY: openlane
-openlane: venv/created
-	@PYTHON_BIN=$(PWD)/venv/bin/$(PYTHON_BIN) $(MAKE) -C docker openlane
+openlane:
+	@$(MAKE) -C docker openlane
+	docker tag efabless/openlane:current-$(DOCKER_ARCH) $(OPENLANE_IMAGE_NAME)-$(DOCKER_ARCH)
 
 .PHONY: openlane-and-push-tools
 openlane-and-push-tools: venv/created

docker/.gitignore

@@ -7,3 +7,4 @@ tar/
 /openlane/
 ol2_hash
 /openlane2
+/result

docker/Makefile

@@ -1,7 +1,6 @@
 PYTHON_BIN ?= python3
-OPENLANE_IMAGE_NAME ?= efabless/openlane:current
 BUILD_ARCH ?= $(shell $(PYTHON_BIN) ./current_platform.py)
-NIX_SYSTEM ?= $(shell $(PYTHON_BIN) ./current_system.py $(BUILD_ARCH))
+NIX_SYSTEM := $(shell $(PYTHON_BIN) ./current_system.py $(BUILD_ARCH))
 
 HASH = $(shell git rev-parse HEAD)
 HASH_SHORT = $(shell git rev-parse --short=7 HEAD)
@@ -21,5 +20,4 @@ merge: openlane
 .PHONY: openlane
 openlane:
 	$(BUILD_CMD)
-	cat $$($(BUILD_CMD)) | docker load
-	docker tag openlane:tmp-$(NIX_SYSTEM) $(OPENLANE_IMAGE_NAME)-$(BUILD_ARCH)
+	cat ./result | docker load

docker/docker.nix

@@ -32,13 +32,22 @@
   neovim,
   zsh,
   silver-searcher,
-}: let
+}:
+
+assert builtins.elem system ["x86_64-linux" "aarch64-linux"];
+
+let
   openlane-env-sitepackages = "${openlane1.pyenv}/${openlane1.pyenv.sitePackages}";
   openlane-env-bin = "${openlane1.pyenv}/bin";
+  docker-arch-name = if system == "x86_64-linux" then
+    "amd64"
+  else
+    "arm64v8"
+  ;
 in
   dockerTools.buildImage rec {
-    name = "openlane";
-    tag = "tmp-${system}";
+    name = "efabless/openlane";
+    tag = "current-${docker-arch-name}";
 
     copyToRoot = buildEnv {
       name = "image-root";