Superset version bump

.github/workflows/latest.yml

@@ -1,21 +1,26 @@
 name: latest
 on:
   push:
+    branches:
+      - main
+      - multiarch
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
       - run: npm install -g dockerlint
       - run: dockerlint
   build:
     runs-on: ubuntu-latest
     needs: lint
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/build-push-action@v5
         with:
-          python-version: "3.8"
-      - run: pip install pipenv
-      - run: make build
+          platforms: |
+            linux/amd64
+            linux/arm64

.github/workflows/push.yml

@@ -7,22 +7,32 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
       - run: npm install -g dockerlint
       - run: dockerlint
   build-push:
     runs-on: ubuntu-latest
     needs: lint
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - uses: actions/setup-python@v3
+      - name: meta
+        id: meta
+        run: |
+          version="$(grep apache-superset Pipfile | grep -Eo '[0-9.]+')"
+          tags="amancevice/superset,amancevice/superset:$version"
+          echo "tags=$tags" >> "$GITHUB_OUTPUT"
+      - uses: docker/build-push-action@v5
         with:
-          python-version: "3.8"
-      - run: pip install pipenv
-      - run: make build
-      - run: make push
+          platforms: |
+            linux/amd64
+            linux/arm64
+          push: true
+          tags: |
+            ${{ steps.meta.outputs.tags }}

.gitignore

@@ -1,3 +1,2 @@
 **/.docker/
 **/.env
-requirements*.txt

.python-version

@@ -1 +1 @@
-3.8.16
+3.11.10

Dockerfile

@@ -1,12 +1,10 @@
-ARG NODE_VERSION=16
-ARG PYTHON_VERSION=3.8
-
+ARG PYTHON_VERSION=3.11
 FROM python:$PYTHON_VERSION
 
 # Configure environment
-# superset recommended defaults: https://superset.apache.org/docs/installation/configuring-superset#running-on-a-wsgi-http-server
-# gunicorn recommended defaults: https://docs.gunicorn.org/en/0.17.2/configure.html#security
-ARG SUPERSET_VERSION=2.0.1
+# superset/gunicorn recommended defaults:
+# - https://superset.apache.org/docs/installation/configuring-superset#running-on-a-wsgi-http-server
+# - https://docs.gunicorn.org/en/latest/configure.html
 ENV FLASK_APP=superset
 ENV GUNICORN_BIND=0.0.0.0:8088
 ENV GUNICORN_LIMIT_REQUEST_FIELD_SIZE=8190
@@ -17,50 +15,50 @@ ENV GUNICORN_WORKERS=10
 ENV GUNICORN_WORKER_CLASS=gevent
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
-ENV PYTHONPATH=/etc/superset:/home/superset:$PYTHONPATH
-ENV SUPERSET_REPO=apache/superset
+ENV PYTHONPATH=/etc/superset:/home/superset
 ENV SUPERSET_HOME=/var/lib/superset
-ENV SUPERSET_VERSION=$SUPERSET_VERSION
 ENV GUNICORN_CMD_ARGS="--bind $GUNICORN_BIND --limit-request-field_size $GUNICORN_LIMIT_REQUEST_FIELD_SIZE --limit-request-line $GUNICORN_LIMIT_REQUEST_LINE --threads $GUNICORN_THREADS --timeout $GUNICORN_TIMEOUT --workers $GUNICORN_WORKERS --worker-class $GUNICORN_WORKER_CLASS"
 
+# Configure filesystem
+COPY bin /usr/local/bin
+VOLUME /etc/superset
+VOLUME /home/superset
+VOLUME /var/lib/superset
+
 # Create superset user & install dependencies
 WORKDIR /home/superset
-COPY requirements*.txt ./
 RUN groupadd supergroup && \
     useradd -U -G supergroup superset && \
-    chown superset:superset /home/superset && \
-    mkdir -p /etc/superset && \
     mkdir -p $SUPERSET_HOME && \
-    chown -R superset:superset /etc/superset && \
+    mkdir -p /etc/superset && \
     chown -R superset:superset $SUPERSET_HOME && \
+    chown -R superset:superset /home/superset && \
+    chown -R superset:superset /etc/superset && \
     apt-get update && \
     apt-get install -y \
-        build-essential \
-        curl \
-        default-libmysqlclient-dev \
-        freetds-bin \
-        freetds-dev \
-        libaio1 \
-        libecpg-dev \
-        libffi-dev \
-        libldap2-dev \
-        libpq-dev \
-        libsasl2-2 \
-        libsasl2-dev \
-        libsasl2-modules-gssapi-mit \
-        libssl-dev && \
-        apt-get clean && \
-    pip install -r requirements.txt && \
-    pip install -r requirements-dev.txt && \
-    pip install apache-superset==$SUPERSET_VERSION
+    build-essential \
+    curl \
+    default-libmysqlclient-dev \
+    freetds-bin \
+    freetds-dev \
+    libaio1 \
+    libecpg-dev \
+    libffi-dev \
+    libldap2-dev \
+    libpq-dev \
+    libsasl2-2 \
+    libsasl2-dev \
+    libsasl2-modules-gssapi-mit \
+    libssl-dev && \
+    apt-get clean && \
+    pip install -U pip
 
-# Configure Filesystem
-COPY bin /usr/local/bin
-VOLUME /etc/superset
-VOLUME /home/superset
-VOLUME /var/lib/superset
+# Install pips
+COPY requirements*.txt ./
+RUN pip install -r requirements.txt && \
+    pip install -r requirements-dev.txt
 
-# Finalize application
+# Configure application
 EXPOSE 8088
 USER superset
 HEALTHCHECK CMD ["curl", "-f", "http://localhost:8088/health"]

Makefile

@@ -1,30 +1,24 @@
+ARCH             := linux/arm64
 REPO             := amancevice/superset
-PYTHON_VERSION   := 3.8
-SUPERSET_VERSION := 2.0.1
+PYTHON_VERSION   := $(shell cat .python-version)
+SUPERSET_VERSION := $(shell grep apache-superset Pipfile | grep -Eo '[0-9.]+')
 
 build: requirements-dev.txt
-	docker build \
+	docker buildx build \
 	--build-arg PYTHON_VERSION=$(PYTHON_VERSION) \
-	--build-arg SUPERSET_VERSION=$(SUPERSET_VERSION) \
+	--platform $(ARCH) \
 	--tag $(REPO) \
 	--tag $(REPO):$(SUPERSET_VERSION) \
 	.
 
 clean:
+	pipenv --rm
 	docker image ls --quiet $(REPO) | uniq | xargs docker image rm --force
 
-edge: requirements-dev.txt
-	docker build \
-	--build-arg PYTHON_VERSION=$(PYTHON_VERSION) \
-	--build-arg SUPERSET_VERSION=master \
-	--file Dockerfile.edge \
-	--tag $(REPO):edge \
-	.
-
 push:
 	docker push --all-tags $(REPO)
 
-.PHONY: build clean demo edge push
+.PHONY: build clean demo push
 
 requirements-dev.txt: requirements.txt
 	pipenv requirements --dev > $@
@@ -34,8 +28,9 @@ requirements.txt: Pipfile.lock
 
 Pipfile.lock: Pipfile | .venv
 	pipenv lock
-	touch .venv
 
-.venv:
+.venv: .python-version
+	-pipenv --rm
 	mkdir -p $@
 	pipenv --python $(PYTHON_VERSION)
+	touch $@