Switch to AmigaPorts repo

Also update the build workflow to only run for tagged pushes to main or workflow dispatch

.github/workflows/build.yml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   build:
+    if: github.event.base_ref == 'refs/heads/main' || github.event.ref == 'refs/heads/main'
     strategy:
       fail-fast: false
       matrix:
@@ -89,7 +90,7 @@ jobs:
           images: |
             ${{ vars.DOCKERHUB_REPO }}
           tags: |
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=latest
             type=sha
             type=ref,event=branch
             type=ref,event=pr

.github/workflows/document.yml

@@ -0,0 +1,24 @@
+name: Update Docker Hub Description
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - README.md
+      - .github/workflows/document.yml
+  workflow_dispatch:
+jobs:
+  description:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Docker Hub Description
+      uses: peter-evans/dockerhub-description@v4
+      with:
+        username: ${{ vars.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        repository:  ${{ vars.DOCKERHUB_REPO }}
+        readme-filepath: ./README.md
+        short-description: ${{ github.event.repository.description }}
+        enable-url-completion: true

Containerfile

@@ -22,7 +22,7 @@ RUN apt-get -y autoremove && \
 # Install Bebbo's amiga-gcc
 RUN git config --global pull.rebase false && \
     cd /root && \
-    git clone --depth 1 https://github.com/bebbo/amiga-gcc.git && \
+    git clone --depth 1 https://github.com/AmigaPorts/m68k-amigaos-gcc amiga-gcc && \
     cd /root/amiga-gcc && \
     mkdir -p /opt/amiga && \
     make update && \
@@ -35,9 +35,13 @@ RUN mkdir -p /tmp/vbcc-targets && \
     curl -o /tmp/vbcc-targets/vbcc_target_m68k-amigaos.lha http://phoenix.owl.de/vbcc/2022-05-22/vbcc_target_m68k-amigaos.lha && \
     cd /tmp/vbcc-targets && \
     lha -x vbcc_target_m68k-amigaos.lha && \
-    cd - && \
     mv /tmp/vbcc-targets/vbcc_target_m68k-amigaos/targets /opt/amiga/m68k-amigaos/vbcc/ && \
-    rm -rf /tmp/vbcc-targets
+    cd - && \
+    mkdir -p /tmp/vbcc-unix-configs && \
+    curl -o /tmp/vbcc-unix-configs/vbcc_unix_config.tar.gz http://phoenix.owl.de/vbcc/2022-02-28/vbcc_unix_config.tar.gz && \
+    tar -xvf /tmp/vbcc-unix-configs/vbcc_unix_config.tar.gz -C /tmp/vbcc-unix-configs && \
+    mv /tmp/vbcc-unix-configs/config /opt/amiga/m68k-amigaos/vbcc/ && \
+    rm -rf /tmp/vbcc-targets /tmp/vbcc-unix-configs
 
 # Clean up
 RUN rm -rf /var/lib/apt/lists/* && \
@@ -45,5 +49,6 @@ RUN rm -rf /var/lib/apt/lists/* && \
       libgmp-dev libmpfr-dev libmpc-dev libncurses-dev rsync texinfo && \
     apt-get -y autoremove
 
-ENV PATH /opt/amiga/bin:$PATH
+ENV VBCC=/opt/amiga/m68k-amigaos/vbcc
+ENV PATH=/opt/amiga/bin:$PATH
 

README.md

@@ -4,7 +4,7 @@
 
 This container is based on work by Sebastian Bergmann: [Docker Hub](https://hub.docker.com/r/sebastianbergmann/amiga-gcc/).
 
-A ready-to-use image built from this Containerfile is available on [Docker Hub](https://hub.docker.com/r/stefanreinauer/amiga-gcc/).
+A ready-to-use image built from this Containerfile is available on [Docker Hub](https://hub.docker.com/r/liv2/amiga-gcc/).
 
 More information can be found [here](https://amiga.sebastian-bergmann.de/presentations/2017/evoke/amiga-software-development-in-2017).
 
@@ -55,7 +55,7 @@ int main()
 ### Compilation
 
 ```
-$ podman run -v $HOME:/host -it stefanreinauer/amiga-gcc \
+$ podman run -v $HOME:/host -it liv2/amiga-gcc \
   m68k-amigaos-gcc /host/hello.c -o /host/hello -noixemul
 ```
 
@@ -76,7 +76,7 @@ $ docker-execute-amiga helloworld
 #### Container-ized Emulation using Virtual AmigaOS (vamos)
 
 ```
-$ podman run -v $HOME:/host stefanreinauer/amiga-gcc \
+$ podman run -v $HOME:/host liv2/amiga-gcc \
   vamos -C 68020 /host/hello
 Hello world!
 ```