8000 Merge pull request #25 from homeylab/export_images · homeylab/bookstack-file-exporter@1574e5f · GitHub
[go: up one dir, main page]
Skip to content

Commit 1574e5f

Browse files
pchang388pchang388
authored
Merge pull request #25 from homeylab/export_images
Export images
2 parents 9d4cd9b + ca227ef commit 1574e5f

File tree

21 files changed

+667
-330
lines changed

21 files changed

+667
-330
lines changed

‎.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
{
44
"name": "Python 3",
55
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "mcr.microsoft.com/devcontainers/python:1-3.11-bullseye",
6+
"image": "mcr.microsoft.com/devcontainers/python:1-3.12-bullseye",
77
"features": {
88
"ghcr.io/devcontainers/features/python:1": {
99
"installTools": true,
10-
"version": "3.11"
10+
"version": "3.12"
1111
}
1212
},
1313
"customizations": {

‎.github/workflows/always.pylint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
python-version: ["3.11"]
10+
python-version: ["3.12"]
1111
steps:
1212
- uses: actions/checkout@v3
1313
- name: Set up Python ${{ matrix.python-version }}

‎.github/workflows/on_pr_open.docker-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
strategy:
1919
matrix:
20-
python-version: ["3.11"]
20+
python-version: ["3.12"]
2121
steps:
2222
- uses: actions/checkout@v3
2323
- name: Set up Python ${{ matrix.python-version }}

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BASE_IMAGE=python
2-
ARG BASE_IMAGE_TAG=3.11-slim-python
2+
ARG BASE_IMAGE_TAG=3.12-slim-python
33

44
FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG}
55

‎Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
## DOCKER BUILD VARS
22
BASE_IMAGE=python
3-
BASE_IMAGE_TAG=3.11-slim-bookworm
3+
BASE_IMAGE_TAG=3.12-slim-bookworm
44
IMAGE_NAME=homeylab/bookstack-file-exporter
55
# keep this start sequence unique (IMAGE_TAG=)
66
# github actions will use this to create a tag
7-
IMAGE_TAG=0.0.2
7+
IMAGE_TAG=0.0.3
88
DOCKER_WORK_DIR=/export
99
DOCKER_CONFIG_DIR=/export/config
1010
DOCKER_EXPORT_DIR=/export/dump
@@ -48,11 +48,11 @@ docker_build_latest:
4848
-t ${IMAGE_NAME}:latest \
4949
--no-cache .
5050

51-
docker_push:
52-
docker push ${IMAGE_NAME}:${IMAGE_TAG}
51+
# docker_push:
52+
# docker push ${IMAGE_NAME}:${IMAGE_TAG}
5353

54-
docker_push_latest:
55-
docker push ${IMAGE_NAME} --all-tags
54+
# docker_push_latest:
55+
# docker push ${IMAGE_NAME} --all-tags
5656

5757
# add -i option due to bug in rancher desktop: https://github.com/rancher-sandbox/rancher-desktop/issues/3239
5858
docker_test:

0 commit comments

Comments
 (0)
0