add publish to GitHub Container Registry

.github/workflows/docker-publish.yml

@@ -11,7 +11,7 @@ on:
   pull_request:
 
 jobs:
-  archlinux:
+  build:
     runs-on: ubuntu-latest
 
     steps:
@@ -25,29 +25,24 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build and push Docker image
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image (archlinux)
         uses: docker/build-push-action@v2
         with:
           context: archlinux
           push: ${{ github.event_name != 'pull_request' }}
-          tags: medzik/android-sdk:archlinux
+          tags: |
+            medzik/android-sdk:archlinux
+            ghcr.io/medzikuser/android-sdk:archlinux
 
-  ubuntu:
-    needs: archlinux
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push Docker image
+      - name: Build and push Docker image (ubuntu)
         uses: docker/build-push-action@v2
         with:
           context: ubuntu
@@ -55,3 +50,5 @@ jobs:
           tags: |
             medzik/android-sdk:ubuntu
             medzik/android-sdk:latest
+            ghcr.io/medzikuser/android-sdk:ubuntu
+            ghcr.io/medzikuser/android-sdk:latest

archlinux/Dockerfile

@@ -3,42 +3,9 @@ FROM medzik/archlinux:latest
 WORKDIR /home/build
 
 # Install dependencies
-RUN sudo pacman -Sy --noconfirm \
-      jdk11-openjdk \
- && yes | sudo pacman -Scc
-
-# Install cmdline tools
-RUN git clone https://aur.archlinux.org/android-sdk-cmdline-tools-latest.git \
- && cd android-sdk-cmdline-tools-latest \
- && makepkg -sr --noconfirm \
- && sudo pacman -U ./*.pkg.tar* --noconfirm \
- && cd .. \
- && rm -rf android-sdk-cmdline-tools-latest \
- && yes | sudo pacman -Scc
-
-# Install platform tools
-RUN git clone https://aur.archlinux.org/android-sdk-platform-tools.git \
- && cd android-sdk-platform-tools \
- && makepkg -sr --noconfirm \
- && sudo pacman -U ./*.pkg.tar* --noconfirm \
- && cd .. \
- && rm -rf android-sdk-platform-tools \
- && yes | sudo pacman -Scc
-
-# Install platform
-RUN git clone https://aur.archlinux.org/android-platform.git \
- && cd android-platform \
- && makepkg -sr --noconfirm \
- && sudo pacman -U ./*.pkg.tar* --noconfirm \
- && cd .. \
- && rm -rf android-platform \
- && yes | sudo pacman -Scc
-
-# Install build tools
-RUN git clone https://aur.archlinux.org/android-sdk-build-tools.git \
- && cd android-sdk-build-tools \
- && makepkg -sr --noconfirm \
- && sudo pacman -U ./*.pkg.tar* --noconfirm \
- && cd .. \
- && rm -rf android-sdk-build-tools \
- && yes | sudo pacman -Scc
+RUN pacman -Sy --noconfirm \
+      android-platform \
+      android-sdk-platform-tools \
+      android-sdk-cmdline-tools-latest \
+      android-sdk-build-tools && \
+ yes | pacman -Scc