Skip to content

Commit

Permalink
Pin down python version to 3.11 and docker base image to Debian bookw…
Browse files Browse the repository at this point in the history
…orm (python 3.11) (#3)
  • Loading branch information
AttilaGombosER authored Jun 15, 2024
1 parent b419cf2 commit ed52363
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 34 deletions.
1 change: 1 addition & 0 deletions .github/workflows/python-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
- name: Package and publish
uses: EffectiveRange/python-package-github-action@v1
with:
python-version: '3.11'
debian-dist-type: 'application'
debian-dist-command: 'make package'
- name: Set up QEMU for multi-architecture builds
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye-slim
FROM debian:bookworm-slim

RUN apt update && apt upgrade -y

Expand Down
16 changes: 2 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,7 @@ IMG_TAG=latest
PACKAGE_ARCHS=armhf,arm64,amd64
ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))

.PHONY: arm64 amd64 package build-image create-service apt-server-arm64-image apt-server-amd64-image apt-server-arm64-service apt-server-amd64-service

arm64:
$(eval ARCH=arm64)
$(eval DOCKER_ARCH=arm64v8)

amd64:
$(eval ARCH=amd64)
$(eval DOCKER_ARCH=$(ARCH))
.PHONY: clean package build-image

clean:
rm -rf build dist *.egg-info
Expand All @@ -22,8 +14,4 @@ package:
dpkg-buildpackage -us -ui -uc --buildinfo-option=-udist --buildinfo-option=-Odist/apt-server.buildinfo --changes-option=-udist --changes-option=-Odist/apt-server.changes

build-image:
docker build $(ROOT_DIR) --file Dockerfile --tag effectiverange/apt-server$(:)$(IMG_TAG) --build-arg --build-arg PACKAGE_ARCHS=$(PACKAGE_ARCHS)

apt-server-arm64-image: arm64 build-image

apt-server-amd64-image: amd64 build-image
docker build $(ROOT_DIR) --file Dockerfile --tag effectiverange/apt-server$(:)$(IMG_TAG) --build-arg PACKAGE_ARCHS=$(PACKAGE_ARCHS)
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ override_dh_builddeb:
dh_builddeb $@ --destdir=$(ARTIFACTS_DIR) -- -Zgzip

%:
dh $@ --with python-virtualenv --python /usr/bin/python3
dh $@ --with python-virtualenv --python $(which python3)
18 changes: 0 additions & 18 deletions service/apt-server.service.template

This file was deleted.

0 comments on commit ed52363

Please sign in to comment.