[#61664] codespace: Dockerfile-lxqt: Update base image

Updates the base image for the `lxqt` to use latest ORFS from docker registries. Signed-off-by: Illia Vysochyn <[email protected]>
antmicro · Jul 3, 2024 · a6ae441 · a6ae441
1 parent d55ddf2
commit a6ae441
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 72 deletions.
diff --git a/.github/workflows/github-actions-publish-docker-images.yml b/.github/workflows/github-actions-publish-docker-images.yml
@@ -1,4 +1,4 @@
-name: Prebuild docker images
+name: Prebuild lxqt docker image
 on:
   push:
   pull_request:
@@ -18,26 +18,21 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Set environment variables
+        run: echo "IMAGE=ghcr.io/$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]'):lxqt" >> $GITHUB_ENV
+
+      - name: Build LXQt
+        run: |
+          docker build -t ${{ env.IMAGE }} -f tools/codespace/Dockerfile-lxqt .
+
       - name: Login to GitHub Container Registry (GHCR)
-        if: github.event_name != 'pull_request' && github.repository == 'antmicro/openroad-flow-scripts'
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           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 .
-
       - 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
+        if: github.event_name != 'pull_request'
+        run: docker push ${{ env.IMAGE }}
diff --git 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
diff --git a/tools/codespace/README.md b/tools/codespace/README.md
@@ -20,15 +20,15 @@ First time Codespace users are encouraged to read the tutorial [creating a codes
 
 ### OpenROAD GUI
 
-At the bottom, there should be tab `PORTS`, where you will find the `Forwarded Address`. A link labelled `Desktop (6080) is provided, which you can follow to open the OpenROAD GUI.
+At the bottom, there should be tab `PORTS`, where you will find the `Forwarded Address`. A link labelled `Desktop (6080)` is provided, which you can follow to open the OpenROAD GUI.
 
 ![open](../../docs/images/open_vnc.gif)
 
 Test that the ORFS flow works by running the following commands:
 
 ```
-cd ~/OpenROAD-flow-scripts/flow
-. ../env.sh
+cd /OpenROAD-flow-scripts/flow
+source ../env.sh
 make
 make gui_final
 ```

diff --git a/tools/codespace/scripts/install-orfs.sh b/tools/codespace/scripts/install-orfs.sh