Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
Signed-off-by: Michal Czyz <[email protected]>
  • Loading branch information
mczyz-antmicro committed Mar 27, 2024
1 parent c2c61f3 commit 69aab1c
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 39 deletions.
File renamed without changes.
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ jobs:
if: github.event_name != 'pull_request' && github.repository == 'antmicro/openroad-codespace'
run: docker push ghcr.io/antmicro/openroad-codespace:orfs

- name: Devcontainer build
run: |
npm install -g @devcontainers/cli
devcontainer build --config .devcontainer/ubuntu-gui/devcontainer.json --workspace-folder . --push false --image-name ghcr.io/antmicro/openroad-codespace:desktop
# docker image tag test:latest ghcr.io/antmicro/openroad-codespace:test
- name: Push container image to GitHub Container Registry (GHCR)
if: github.event_name != 'pull_request' && github.repository == 'antmicro/openroad-codespace'
run: docker push ghcr.io/antmicro/openroad-codespace:desktop
# - name: Devcontainer build
# run: |
# npm install -g @devcontainers/cli
# devcontainer build --config .devcontainer/ubuntu-gui/devcontainer.json --workspace-folder . --push false --image-name ghcr.io/antmicro/openroad-codespace:desktop
# # docker image tag test:latest ghcr.io/antmicro/openroad-codespace:test

# - name: Push container image to GitHub Container Registry (GHCR)
# if: github.event_name != 'pull_request' && github.repository == 'antmicro/openroad-codespace'
# run: docker push ghcr.io/antmicro/openroad-codespace:desktop

- name: Docker build
run: |
Expand Down
6 changes: 1 addition & 5 deletions Dockerfile-lxqt
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
FROM ghcr.io/antmicro/openroad-codespace:desktop
FROM ghcr.io/antmicro/openroad-codespace:orfs

COPY ./scripts/install-desktop.sh /usr/local/bin/install-desktop.sh
RUN bash /usr/local/bin/install-desktop.sh
RUN chsh -s /bin/bash

# COPY ./scripts/install-lxqt.sh /usr/local/bin/install-lxqt.sh
# RUN bash /usr/local/bin/install-lxqt.sh
# RUN chsh -s /bin/bash
18 changes: 17 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ First time Codespace users are encouraged to read the tutorial [creating a codes

## Using the Codespace

### OpenROAD GUI

1. At the bottom, there should be tab `PORTS`, where you will find the `Forwarded Address`. A link is provided, which you can follow to open the OpenROAD GUI

![open](https://github.com/antmicro/openroad-codespace/blob/mczyz/dev/img/open_vnc.gif)
Expand All @@ -32,6 +34,20 @@ make
make gui_final
```

### Useful scripts

You can change the resolution with script:

```
/usr/local/bin/set-resolution
```

Desktop initialization is performed in:

```
/usr/local/share/desktop-init.sh
```

## VSCode

1. You can also use VSCode to connect to Codespaces
Expand All @@ -51,4 +67,4 @@ Useful resources:

### Desktop-lite feature

The desktop-lite feature is provided by the [devcontainers organization](https://github.com/devcontainers/features/tree/main/src/desktop-lite). In this repo, a modified version of the feature is used via the [update-link] script.
The desktop-lite feature is provided by the [devcontainers organization](https://github.com/devcontainers/features/tree/main/src/desktop-lite). In this repo, a modified version of the feature is used via the [TODO-link] script.
File renamed without changes.
File renamed without changes.
File renamed without changes.
24 changes: 0 additions & 24 deletions scripts/install-desktop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,25 +117,6 @@ export DEBIAN_FRONTEND=noninteractive

apt_get_update

# On older Ubuntu, Tilix is in a PPA. on Debian stretch its in backports.
if [[ -z $(apt-cache --names-only search ^tilix$) ]]; then
. /etc/os-release
if [ "${ID}" = "ubuntu" ]; then
check_packages apt-transport-https software-properties-common
add-apt-repository -y ppa:webupd8team/terminix
elif [ "${VERSION_CODENAME}" = "stretch" ]; then
echo "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/stretch-backports.list
fi
apt-get update
if [[ -z $(apt-cache --names-only search ^tilix$) ]]; then
echo "(!) WARNING: Tilix not available on ${ID} ${VERSION_CODENAME} architecture $(uname -m). Skipping."
else
package_list="${package_list} tilix"
fi
else
package_list="${package_list} tilix"
fi

# Install X11, fluxbox and VS Code dependencies
check_packages ${package_list}

Expand All @@ -145,11 +126,6 @@ if ! type vncpasswd > /dev/null 2>&1; then
check_packages ${package_list_additional}
fi

# Install Emoji font if available in distro - Available in Debian 10+, Ubuntu 18.04+
if dpkg-query -W fonts-noto-color-emoji > /dev/null 2>&1 && ! dpkg -s fonts-noto-color-emoji > /dev/null 2>&1; then
apt-get -y install --no-install-recommends fonts-noto-color-emoji
fi

# Check at least one locale exists
if ! grep -o -E '^\s*en_US.UTF-8\s+UTF-8' /etc/locale.gen > /dev/null; then
echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
Expand Down

0 comments on commit 69aab1c

Please sign in to comment.