Build multi-arch images based on Debian

.github/workflows/push.yml

@@ -13,12 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     name: Checks syntax of our code
     steps:
-    - uses: actions/checkout@v2
+    -
+      uses: actions/checkout@v2
       with:
         # Full git history is needed to get a proper list of changed files within `super-linter`
         fetch-depth: 0
-    - uses: actions/setup-python@v2
-    - name: Lint Code Base
+    -
+      uses: actions/setup-python@v2
+    -
+      name: Lint Code Base
       uses: github/super-linter@v4
       env:
         DEFAULT_BRANCH: develop
@@ -35,32 +38,49 @@ jobs:
         PYTHON_BLACK_CONFIG_FILE: pyproject.toml
         PYTHON_FLAKE8_CONFIG_FILE: .flake8
         PYTHON_ISORT_CONFIG_FILE: pyproject.toml
+
   build:
-    continue-on-error: ${{ matrix.docker_from == 'alpine:edge' }}
+    continue-on-error: ${{ matrix.build_cmd != './build-latest.sh' }}
     strategy:
       matrix:
         build_cmd:
         - ./build-latest.sh
         - PRERELEASE=true ./build-latest.sh
         - ./build.sh feature
         - ./build.sh develop
-        docker_from:
-        - '' # use the default of the build script
-        - alpine:edge
+        platform:
+        - linux/amd64
+        - linux/arm64
       fail-fast: false
     runs-on: ubuntu-latest
     name: Builds new NetBox Docker Images
     steps:
-    - id: git-checkout
+    -
       name: Checkout
       uses: actions/checkout@v2
-    - id: docker-build
-      name: Build the image from '${{ matrix.docker_from }}' with '${{ matrix.build_cmd }}'
+    -
+      name: Get Version of NetBox Docker
+      run: |
+        echo "::set-output name=version::$(cat VERSION)"
+      shell: bash
+    -
+      name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    -
+      id: buildx-setup
+      name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+      with:
+        install: true
+    -
+      id: docker-build
+      name: Build the image with '${{ matrix.build_cmd }}'
       run: ${{ matrix.build_cmd }}
       env:
-        DOCKER_FROM: ${{ matrix.docker_from }}
         GH_ACTION: enable
-    - id: docker-test
+        BUILDX_BUILDER_NAME: ${{ steps.buildx-setup.outputs.name }}
+        BUILDX_PLATFORMS: ${{ matrix.platform }}
+    -
       name: Test the image
       run: IMAGE="${FINAL_DOCKER_TAG}" ./test.sh
       if: steps.docker-build.outputs.skipped != 'true'

.github/workflows/release.yml

@@ -16,6 +16,8 @@ jobs:
         - PRERELEASE=true ./build-latest.sh
         - ./build.sh feature
         - ./build.sh develop
+        platform:
+        - linux/amd64,linux/arm64
       fail-fast: false
     runs-on: ubuntu-latest
     name: Builds new NetBox Docker Images
@@ -46,12 +48,12 @@ jobs:
       run: ${{ matrix.build_cmd }}
       env:
         GH_ACTION: enable
+        BUILDX_BUILDER_NAME: ${{ steps.buildx-setup.outputs.name }}
+        BUILDX_PLATFORMS: ${{ matrix.platform }}
     -
       name: Test the image
       run: IMAGE="${FINAL_DOCKER_TAG}" ./test.sh
       if: steps.docker-build.outputs.skipped != 'true'
-
-    # docker.io
     -
       name: Login to docker.io
       uses: docker/login-action@v1

.gitignore

@@ -13,3 +13,4 @@ configuration/ldap/*
 !configuration/plugins.py
 prometheus.yml
 super-linter.log
+.buildx-cache

Dockerfile

@@ -1,44 +1,31 @@
 ARG FROM
 FROM ${FROM} as builder
 
-RUN apk add --no-cache \
-      bash \
-      build-base \
-      cargo \
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update -qq \
+  && apt-get install \
+      --yes -qq --no-install-recommends \
+      build-essential \
       ca-certificates \
-      cmake \
-      cyrus-sasl-dev \
-      git \
       graphviz \
-      jpeg-dev \
       libevent-dev \
       libffi-dev \
-      libxslt-dev \
-      make \
-      musl-dev \
-      openldap-dev \
-      postgresql-dev \
-      py3-pip \
+      libjpeg-dev \
+      libldap-dev \
+      libsasl2-dev \
+      libxslt1-dev \
+      libxml2-dev \
+      postgresql-13 \
       python3-dev \
+      python3-pip \
+      python3-venv \
   && python3 -m venv /opt/netbox/venv \
   && /opt/netbox/venv/bin/python3 -m pip install --upgrade \
       pip \
       setuptools \
       wheel
 
-# Build libcrc32c for google-crc32c python module
-RUN git clone https://github.com/google/crc32c \
-    && cd crc32c \
-    && git submodule update --init --recursive \
-    && mkdir build \
-    && cd build \
-    && cmake \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCRC32C_BUILD_TESTS=no \
-        -DCRC32C_BUILD_BENCHMARKS=no \
-        -DBUILD_SHARED_LIBS=yes \
-        .. \
-    && make all install
+WORKDIR /opt/netbox/
 
 ARG NETBOX_PATH
 COPY ${NETBOX_PATH}/requirements.txt requirements-container.txt /
@@ -53,35 +40,40 @@ RUN /opt/netbox/venv/bin/pip install \
 ARG FROM
 FROM ${FROM} as main
 
-RUN apk add --no-cache \
-      bash \
+ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8
+RUN . /etc/os-release \
+  && apt-get update -qq \
+  && apt-get upgrade \
+      --yes -qq --no-install-recommends \
+  && apt-get install \
+      --yes -qq --no-install-recommends \
       ca-certificates \
       curl \
-      graphviz \
-      libevent \
-      libffi \
-      libjpeg-turbo \
-      libxslt \
       openssl \
       postgresql-client \
-      postgresql-libs \
-      py3-pip \
       python3 \
+      python3-distutils \
+  && curl -sL https://nginx.org/keys/nginx_signing.key | \
+    tee /etc/apt/trusted.gpg.d/nginx.asc \
+  && echo "deb https://packages.nginx.org/unit/debian/ ${VERSION_CODENAME} unit" | \
+    tee /etc/apt/sources.list.d/unit.list \
+  && apt-get update -qq \
+  && apt-get install \
+      --yes -qq --no-install-recommends \
+      unit=1.26.0-1~bullseye \
+      unit-python3.9=1.26.0-1~bullseye \
       tini \
-      unit \
-      unit-python3
+  && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt
 
-COPY --from=builder /usr/local/lib/libcrc32c.* /usr/local/lib/
-COPY --from=builder /usr/local/include/crc32c /usr/local/include
-COPY --from=builder /usr/local/lib/cmake/Crc32c /usr/local/lib/cmake/
 COPY --from=builder /opt/netbox/venv /opt/netbox/venv
 
 ARG NETBOX_PATH
 COPY ${NETBOX_PATH} /opt/netbox
 
 COPY docker/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py
+COPY docker/ldap_config.docker.py /opt/netbox/netbox/netbox/ldap_config.py
 COPY docker/docker-entrypoint.sh /opt/netbox/docker-entrypoint.sh
 COPY docker/housekeeping.sh /opt/netbox/housekeeping.sh
 COPY docker/launch-netbox.sh /opt/netbox/launch-netbox.sh
@@ -90,37 +82,26 @@ COPY initializers/ /opt/netbox/initializers/
 COPY configuration/ /etc/netbox/config/
 COPY docker/nginx-unit.json /etc/unit/
 
-WORKDIR /opt/netbox/netbox
+WORKDIR /opt/netbox
 
 # Must set permissions for '/opt/netbox/netbox/media' directory
 # to g+w so that pictures can be uploaded to netbox.
 RUN mkdir -p static /opt/unit/state/ /opt/unit/tmp/ \
-      && chown -R unit:root media /opt/unit/ \
-      && chmod -R g+w media /opt/unit/ \
-      && cd /opt/netbox/ && /opt/netbox/venv/bin/python -m mkdocs build \
+      && chown -R unit:root /opt/netbox/netbox/media /opt/unit/ \
+      && chmod -R g+w /opt/netbox/netbox/media /opt/unit/ \
+      && /opt/netbox/venv/bin/python -m mkdocs build \
           --config-file /opt/netbox/mkdocs.yml --site-dir /opt/netbox/netbox/project-static/docs/ \
       && SECRET_KEY="dummy" /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py collectstatic --no-input
 
-ENTRYPOINT [ "/sbin/tini", "--" ]
+WORKDIR /opt/netbox/netbox
+ENTRYPOINT [ "/usr/bin/tini", "--" ]
 
 CMD [ "/opt/netbox/docker-entrypoint.sh", "/opt/netbox/launch-netbox.sh" ]
 
 LABEL ORIGINAL_TAG="" \
       NETBOX_GIT_BRANCH="" \
       NETBOX_GIT_REF="" \
       NETBOX_GIT_URL="" \
-# See http://label-schema.org/rc1/#build-time-labels
-# Also https://microbadger.com/labels
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.build-date="" \
-      org.label-schema.name="NetBox Docker" \
-      org.label-schema.description="A container based distribution of NetBox, the free and open IPAM and DCIM solution." \
-      org.label-schema.vendor="The netbox-docker contributors." \
-      org.label-schema.url="https://github.com/netbox-community/netbox-docker" \
-      org.label-schema.usage="https://github.com/netbox-community/netbox-docker/wiki" \
-      org.label-schema.vcs-url="https://github.com/netbox-community/netbox-docker.git" \
-      org.label-schema.vcs-ref="" \
-      org.label-schema.version="snapshot" \
 # See https://github.com/opencontainers/image-spec/blob/master/annotations.md#pre-defined-annotation-keys
       org.opencontainers.image.created="" \
       org.opencontainers.image.title="NetBox Docker" \
@@ -133,16 +114,3 @@ LABEL ORIGINAL_TAG="" \
       org.opencontainers.image.source="https://github.com/netbox-community/netbox-docker.git" \
       org.opencontainers.image.revision="" \
       org.opencontainers.image.version="snapshot"
-
-#####
-## LDAP specific configuration
-#####
-
-FROM main as ldap
-
-RUN apk add --no-cache \
-      libsasl \
-      libldap \
-      util-linux
-
-COPY docker/ldap_config.docker.py /opt/netbox/netbox/netbox/ldap_config.py

build-latest.sh

@@ -3,6 +3,8 @@
 
 echo "▶️ $0 $*"
 
+source ./build-functions/gh-functions.sh
+
 ###
 # Check for the jq library needed for parsing JSON
 ###
@@ -75,10 +77,7 @@ if [ "${PRERELEASE}" == "true" ]; then
 
     echo "❎ Latest unstable version '${VERSION}' is not higher than the latest stable version '$STABLE_VERSION'."
     if [ -z "$DEBUG" ]; then
-      if [ -n "${GH_ACTION}" ]; then
-        echo "::set-output name=skipped::true"
-      fi
-
+      gh_echo "::set-output name=skipped::true"
       exit 0
     else
       echo "⚠️ Would exit here with code '0', but DEBUG is enabled."