From 92151c54db0522cb0eb1f37d9b44706288646a8f Mon Sep 17 00:00:00 2001
From: Illia Vysochyn <ivysochyn@antmicro.com>
Date: Mon, 1 Jul 2024 13:29:51 +0200
Subject: [PATCH] [#61664] WIP: codespace: Dockerfile-lxqt: Update base image

Signed-off-by: Illia Vysochyn <ivysochyn@antmicro.com>
---
 .../github-actions-publish-docker-images.yml        | 12 ++----------
 tools/codespace/Dockerfile-lxqt                     |  2 +-
 tools/codespace/Dockerfile-orfs                     | 13 -------------
 3 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 tools/codespace/Dockerfile-orfs

diff --git a/.github/workflows/github-actions-publish-docker-images.yml b/.github/workflows/github-actions-publish-docker-images.yml
index ac23f36d50..cf686b314f 100644
--- a/.github/workflows/github-actions-publish-docker-images.yml
+++ b/.github/workflows/github-actions-publish-docker-images.yml
@@ -26,18 +26,10 @@ jobs:
           username: gha
           password: ${{ github.token }}
 
-      - name: Build ORFS
-        run: |
-          docker build -t ghcr.io/antmicro/openroad-flow-scripts:orfs -f tools/codespace/Dockerfile-orfs .
-
-      - name: Push container image to GitHub Container Registry (GHCR)
-        if: github.event_name != 'pull_request' && github.repository == 'antmicro/openroad-flow-scripts'
-        run: docker push ghcr.io/antmicro/openroad-flow-scripts:orfs
-
       - name: Build LXQt
         run: |
-          docker build -t ghcr.io/antmicro/openroad-flow-scripts:lxqt -f tools/codespace/Dockerfile-lxqt .
+          docker build -t ghcr.io/antmicro/openroad-flow-scripts:lxqt-test -f tools/codespace/Dockerfile-lxqt .
 
       - name: Push container image to GitHub Container Registry (GHCR)
         if: github.event_name != 'pull_request' && github.repository == 'antmicro/openroad-flow-scripts'
-        run: docker push ghcr.io/antmicro/openroad-flow-scripts:lxqt
+        run: docker push ghcr.io/antmicro/openroad-flow-scripts:lxqt-test
diff --git a/tools/codespace/Dockerfile-lxqt b/tools/codespace/Dockerfile-lxqt
index eba65f4095..370ff41ce0 100644
--- a/tools/codespace/Dockerfile-lxqt
+++ b/tools/codespace/Dockerfile-lxqt
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Antmicro <www.antmicro.com>
 # SPDX-License-Identifier: Apache-2.0
 
-FROM ghcr.io/antmicro/openroad-flow-scripts:orfs
+FROM openroad/orfs:latest
 
 COPY ./tools/codespace/scripts/common.sh /usr/local/bin/common.sh
 COPY ./tools/codespace/scripts/install-desktop-deps.sh /usr/local/bin/install-desktop-deps.sh
diff --git a/tools/codespace/Dockerfile-orfs b/tools/codespace/Dockerfile-orfs
deleted file mode 100644
index a05ff667b8..0000000000
--- a/tools/codespace/Dockerfile-orfs
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2024 Antmicro <www.antmicro.com>
-# SPDX-License-Identifier: Apache-2.0
-
-FROM ubuntu:22.04
-
-COPY ./tools/codespace/scripts/install-orfs.sh /usr/local/bin/install-orfs.sh
-RUN bash /usr/local/bin/install-orfs.sh
-
-ENV PATH="$PATH:/usr/local/bin"
-
-ENV PATH="$PATH:/yosys/"
-ENV OPENROAD_EXE=/usr/bin/openroad
-ENV YOSYS_CMD=/yosys/yosys