Skip to content

Commit

Permalink
Rebase to Alpine 3.18, drop armhf
Browse files Browse the repository at this point in the history
  • Loading branch information
thespad committed May 12, 2023
1 parent 8e0fd51 commit 3220f81
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/call-baseimage-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
with:
repo_owner: "thespad"
baseimage: "alpine"
basebranch: "3.17"
basebranch: "3.18"
app_name: "py-kms"
secrets:
repo_scoped_token: ${{ secrets.repo_scoped_token }}
2 changes: 1 addition & 1 deletion .github/workflows/call-build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
release_type: "github_commit"
release_url: "https://api.github.com/repos/Py-KMS-Organization/py-kms/commits/master"
dockerhub_user: "thespad"
target-arch: "all"
target-arch: "64"
secrets:
dockerhub_password: ${{ secrets.DOCKER_PASSWORD }}
15 changes: 10 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM ghcr.io/linuxserver/baseimage-alpine:3.17
FROM ghcr.io/linuxserver/baseimage-alpine:3.18

# set version label
ARG BUILD_DATE
Expand All @@ -12,6 +12,10 @@ LABEL org.opencontainers.image.source="https://github.com/thespad/docker-py-kms"
LABEL org.opencontainers.image.url="https://github.com/thespad/docker-py-kms"
LABEL org.opencontainers.image.description="A port of node-kms created by cyrozap, which is a port of either the C#, C++, or .NET implementations of KMS Emulator."

ENV PYTHONIOENCODING=utf-8 \
VIRTUAL_ENV=/pyenv \
PATH="/pyenv/bin:$PATH"

RUN \
apk add --no-cache --update --virtual=build-dependencies \
build-base \
Expand All @@ -22,13 +26,14 @@ RUN \
git clone https://github.com/Py-KMS-Organization/py-kms/ /tmp/py-kms && \
mv /tmp/py-kms/py-kms /home/ && \
mv /tmp/py-kms/docker/docker-py3-kms-minimal/requirements.txt /home/py-kms && \
python3 -m ensurepip && \
pip3 install -U --no-cache-dir \
mkdir -p /pyenv && \
python3 -m venv /pyenv && \
pip install -U --no-cache-dir \
pip \
setuptools \
wheel && \
pip3 install -U --no-cache-dir pytz && \
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17 -r /home/py-kms/requirements.txt && \
pip install -U --no-cache-dir pytz && \
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18 -r /home/py-kms/requirements.txt && \
apk del --purge \
build-dependencies && \
rm -rf \
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The architectures supported by this image are:
| :----: | :----: | ---- |
| x86-64 || latest |
| arm64 || latest |
| armhf | | latest |
| armhf | | latest |

## Application Setup

Expand Down Expand Up @@ -111,6 +111,7 @@ In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as bel

## Versions

* **14.05.23:** - Rebase to Alpine 3.18. Drop support for armhf.
* **19.03.23:** - Add `pytz`.
* **09.12.22:** - Rebase to Alpine 3.17.
* **24.09.22:** - Rebase to Alpine 3.16, migrate to s6v3.
Expand Down
2 changes: 1 addition & 1 deletion get-version.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#! /bin/bash

APP_VERSION=$(curl -sX GET https://api.github.com/repos/Py-KMS-Organization/py-kms/commits?sha=master | jq -r 'first(.[] ) | .sha' | cut -c 1-7)
APP_VERSION=$(curl -sX GET https://api.github.com/repos/Py-KMS-Organization/py-kms/commits?sha=master | jq -r 'first(.[] ) | .sha' | cut -c 1-8)

printf "%s" "${APP_VERSION}"

0 comments on commit 3220f81

Please sign in to comment.