Skip to content

Commit 1ca3950

Browse files
build: update build-and-push.yml.
1 parent adba182 commit 1ca3950

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

.github/workflows/build-and-push-python-pg.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
- linux/amd64,linux/arm64
1515
jobs:
1616
build-and-push-python-pg-to-ghcr:
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-latest
1818
steps:
1919
- name: Check Disk Space
2020
run: df -h
@@ -37,7 +37,7 @@ jobs:
3737
- name: Prepare
3838
id: prepare
3939
run: |
40-
DOCKER_IMAGE=ghcr.io/1panel-dev/maxkb-python-pg
40+
DOCKER_IMAGE=ghcr.io/1panel-dev/maxkb-base
4141
DOCKER_PLATFORMS=${{ github.event.inputs.architecture }}
4242
TAG_NAME=python3.11-pg17.4
4343
DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME}"
@@ -50,9 +50,6 @@ jobs:
5050
${DOCKER_IMAGE_TAGS} .
5151
- name: Set up QEMU
5252
uses: docker/setup-qemu-action@v3
53-
with:
54-
# Until https://github.com/tonistiigi/binfmt/issues/215
55-
image: tonistiigi/binfmt:qemu-v7.0.0-28
5653
- name: Set up Docker Buildx
5754
uses: docker/setup-buildx-action@v3
5855
- name: Login to GitHub Container Registry

installer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RUN cd ui && \
55
npm install && \
66
npm run build && \
77
rm -rf ./node_modules
8-
FROM ghcr.io/1panel-dev/maxkb-python-pg:python3.11-pg17.4 AS stage-build
8+
FROM ghcr.io/1panel-dev/maxkb-base:python3.11-pg17.4 AS stage-build
99

1010
ARG DEPENDENCIES=" \
1111
python3-pip"
@@ -29,7 +29,7 @@ RUN python3 -m venv /opt/py3 && \
2929
poetry install && \
3030
export MAXKB_CONFIG_TYPE=ENV && python3 /opt/maxkb-app/apps/manage.py compilemessages
3131

32-
FROM ghcr.io/1panel-dev/maxkb-python-pg:python3.11-pg17.4
32+
FROM ghcr.io/1panel-dev/maxkb-base:python3.11-pg17.4
3333
ARG DOCKER_IMAGE_TAG=dev \
3434
BUILD_AT \
3535
GITHUB_COMMIT

0 commit comments

Comments
 (0)