diff --git a/.forgejo/workflows/build-on-commit.yml b/.forgejo/workflows/build-on-commit.yml index 1303513..fba6d8f 100644 --- a/.forgejo/workflows/build-on-commit.yml +++ b/.forgejo/workflows/build-on-commit.yml @@ -35,7 +35,7 @@ jobs: - name: Build and push multi-arch Docker images run: | docker buildx build \ - --platform linux/amd64 \ + --platform linux/amd64,linux/arm64 \ --tag $REPO_HOST/$REPO_PATH:${{ github.sha }} \ --tag $REPO_HOST/$REPO_PATH:nightly \ --push \ diff --git a/.forgejo/workflows/build-on-tag.yml b/.forgejo/workflows/build-on-tag.yml index 2920d84..012b946 100644 --- a/.forgejo/workflows/build-on-tag.yml +++ b/.forgejo/workflows/build-on-tag.yml @@ -34,7 +34,7 @@ jobs: - name: Build and push Docker images run: | docker buildx build \ - --platform linux/amd64 \ + --platform linux/amd64,linux/arm64 \ --tag $REPO_HOST/$REPO_PATH:$TAG \ --tag $REPO_HOST/$REPO_PATH:latest \ --push \ diff --git a/Dockerfile b/Dockerfile index fb1911f..5f1c5ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM git.merith.xyz/gns3/base-vnc:latest ## START setting your image here -RUN apk add --no-cache wine +# RUN apk add --no-cache firefox-esr ## STOP setting up your image here # DO NOT REMOVE AND DO NOT ADD AN "ENTRYPOINT" COMMAND diff --git a/entrypoint.sh b/entrypoint.sh index e8ea64b..e4891f6 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,17 +1,3 @@ #!/bin/bash -# Wait until internet is available -while ! ping -c1 1.1.1.1 &>/dev/null; do - echo "Waiting for internet connection..." - sleep 5 -done - -if [ ! -f "/data/winbox64.exe" ]; then - echo "Winbox executable not found in /data. Downloading..." - mkdir -p /data - wget -O /data/winbox64.exe https://download.mikrotik.com/routeros/winbox/3.42/winbox64.exe -else - echo "Winbox executable found in /data." -fi - -wine64 /tmp/winbox64.exe +xterm \ No newline at end of file