apicula: rebase and update (#11)

Author: umarcor

.github/workflows/apicula.yml

@@ -36,6 +36,11 @@ jobs:
 
   apicula:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - debian-buster
     steps:
 
     - uses: actions/checkout@v2
@@ -44,11 +49,25 @@ jobs:
 
     - run: echo "$(pwd)/.github/bin" >> $GITHUB_PATH
 
-    - run: dockerBuild pkg:apicula  apicula pkg
-    - run: dockerBuild apicula      apicula
+    - run: dockerBuild -b ${{ matrix.os }} -i pkg:apicula -d apicula -t pkg
+    - run: dockerBuild -b ${{ matrix.os }} -i apicula     -d apicula
 
-    - run: dockerTestPkg apicula
-    - run: dockerTest apicula
+    - run: dockerTestPkg ${{ matrix.os }} apicula
+    - run: dockerTest ${{ matrix.os }} apicula
+
+    - name: Login to ghcr.io
+      if: github.event_name != 'pull_request' && github.repository == 'hdl/containers'
+      uses: docker/login-action@v1
+      with:
+        registry: ghcr.io
+        username: gha
+        password: ${{ github.token }}
+
+    - if: github.event_name != 'pull_request' && github.repository == 'hdl/containers'
+      run: >-
+        dockerPush ${{ matrix.os }}
+        pkg:apicula
+        apicula
 
     - name: Login to DockerHub
       if: github.event_name != 'pull_request' && github.repository == 'hdl/containers'
@@ -57,9 +76,17 @@ jobs:
         username: ${{ secrets.DOCKER_USER }}
         password: ${{ secrets.DOCKER_PASS }}
 
-    - run: dockerPush pkg:apicula
-      if: github.event_name != 'pull_request' && github.repository == 'hdl/containers'
+    # Mirror to docker.io/hdlc
 
-    - run: dockerPush apicula
-      if: github.event_name != 'pull_request' && github.repository == 'hdl/containers'
+    - name: Login to docker.io
+      if: github.event_name != 'pull_request' && github.repository == 'hdl/containers' && ${{ matrix.os }} == 'debian-buster'
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USER }}
+        password: ${{ secrets.DOCKER_PASS }}
 
+    - if: github.event_name != 'pull_request' && github.repository == 'hdl/containers' && ${{ matrix.os }} == 'debian-buster'
+      run: >-
+        dockerMirror ${{ matrix.os }}
+        pkg:apicula
+        apicula

apicula.dockerfile renamed to debian-buster/apicula.dockerfile

@@ -1,4 +1,5 @@
-# syntax=docker/dockerfile:experimental
+# syntax=docker/dockerfile:1.2
+
 # Authors:
 #   Unai Martinez-Corral
 #   Lucas Teske
@@ -19,26 +20,40 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-FROM hdlc/build:build AS build
+ARG REGISTRY='ghcr.io/hdl/debian-buster'
+
+#---
+
+FROM $REGISTRY/build:build AS build
 
 RUN apt-get update -qq \
- && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends wget
+ && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
+    wget \
+    python3-dev \
+    python3-setuptools \
+    python3-wheel
 
-RUN mkdir /opt/apicula \
+RUN mkdir /opt/apicula /tmp/apicula \
  && wget https://files.pythonhosted.org/packages/1a/d6/b3162f87ff114d639095fe7c0655080ee16caff9037d6629f738d8b28d92/Apycula-0.0.1a6.tar.gz \
  && tar -xvf Apycula-0.0.1a6.tar.gz --strip-components=1 -C /opt/apicula \
- && ls -lah /opt/apicula
+ && cd /opt/apicula \
+ && python3 setup.py bdist_wheel \
+ && mv dist/*.whl /tmp/apicula/
 
 #---
 
 FROM scratch AS pkg
-COPY --from=build /opt/apicula /apicula
+COPY --from=build /tmp/apicula /apicula
 
 #---
 
-FROM hdlc/build:base
+FROM $REGISTRY/build:base
 
-RUN --mount=type=cache,from=build,src=/opt/apicula,target=/opt/apicula cd /opt/apicula \
- && python3 setup.py install \
- && rm -rf ~/.cache
+RUN apt-get update -qq \
+ && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
+    python3-pip \
+    python3-setuptools \
+    python3-wheel
 
+RUN --mount=type=cache,from=build,src=/tmp/apicula,target=/tmp/apicula pip3 install -U /tmp/apicula/*.whl --progress-bar off \
+ && rm -rf ~/.cache

debian-buster/base.dockerfile

@@ -24,7 +24,6 @@ RUN apt-get update -qq \
     ca-certificates \
     curl \
     python3 \
-    python3-setuptools \
  && apt-get autoclean && apt-get clean && apt-get -y autoremove \
  && update-ca-certificates \
  && rm -rf /var/lib/apt/lists/*

test/apicula.pkg.sh

@@ -24,6 +24,8 @@ set -e
 
 cd $(dirname "$0")
 
-tree /
+./_tree.sh
+
+ls -la /*.whl
 
 ./_todo.sh