Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ $(and $(IMAGE_ENV),$(subst $(newline),$(newline)ENV ,$(newline)$(IMAGE_ENV)))

# }}}

CMD $(or $(IMAGE_CMD),$(call to_json_array,$(IMAGE_SHELL)))
CMD $(call to_json_array,$(or $(IMAGE_CMD),$(IMAGE_SHELL)))

# vim: foldmethod=marker foldlevel=0 sw=4
endef
Expand Down
2 changes: 1 addition & 1 deletion docker/ubuntu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DEFAULT_IMAGE_SHELL = bash -l
DEFAULT_IMAGE_USER = ko
DEFAULT_IMAGE_WORKDIR = /home/$(IMAGE_USER)

UBUNTU_IMAGE = docker.io/library/ubuntu:jammy
UBUNTU_IMAGE = docker.io/library/ubuntu:22.04

define DEFAULT_IMAGE_PRE
USER 0
Expand Down
1 change: 1 addition & 0 deletions docker/ubuntu/nightswatcher/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ RUN rm -rf koreader-base-*

# Install nightswatcher's other python dependencies.
COPY --chmod=644 nightswatcher/requirements.txt /nightswatcher/
RUN python3 -c "import os, sysconfig; os.unlink(sysconfig.get_path('stdlib') + '/EXTERNALLY-MANAGED')"
RUN uv pip install --no-cache --system -r /nightswatcher/requirements.txt

# And finally the nightswatcher' script itself.
Expand Down
10 changes: 3 additions & 7 deletions docker/ubuntu/nightswatcher/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Usage
-----

First, you need to setup a pipeline service hook token and trigger token
in gitlab. The webhook needs to be pointed at:
`http://YOURDOMAIN:9742/webhooks/gitlab-pipeline`.
in GitHub. The webhook needs to be pointed at:
`http://YOURDOMAIN:9742/webhooks/github`.

Then spin up the service with the following Docker command:

Expand All @@ -19,12 +19,8 @@ docker run \
--rm \
-v `pwd`/download:/data/release_download \
-v `pwd`/ota:/data/ota \
-v `pwd`/metadata:/metadata \
-p 9742:9742 \
-e GITLAB_WEBHOOK_TOKEN='bar' \
-e APK_SIGN_KEY_PASS='foo' \
-e APK_SIGN_STORE_PASS='foo' \
-e APK_SIGN_KEY_STORE_PATH='/metadata/apk.keystore' \
-e GITHUB_WEBHOOK_SECRET='bar' \
-d koreader/nightswatcher
```

Expand Down
Loading
Loading