nicolabs/nicobot
1
0
Fork 0
mirror of https://github.com/nicolabs/nicobot.git synced 2026-02-22 18:25:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed : signal image was always FROM the published debian (never from dev)

Browse source
This commit is contained in:
nicobo 2021-03-15 22:50:40 +01:00
parent 15c5f9393c
commit a390ec6268
No known key found for this signature in database
GPG key ID: 2581E71C5FA5285F
3 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/dockerhub.yml vendored
View file

@ -249,6 +249,8 @@ jobs:
with: with:
context: ./ context: ./
file: ./signal-debian.Dockerfile file: ./signal-debian.Dockerfile
build-args: |
NICOBOT_BASE_IMAGE=${{ steps.docker_build_debian.outputs.digest }}
builder: ${{ steps.buildx.outputs.name }} builder: ${{ steps.buildx.outputs.name }}
platforms: linux/arm/v7,linux/arm64,linux/386,linux/amd64 platforms: linux/arm/v7,linux/arm64,linux/386,linux/amd64
push: true push: true

22
Makefile
View file

@ -6,15 +6,21 @@ build:
python3 setup.py build sdist bdist_wheel python3 setup.py build sdist bdist_wheel
docker-build-alpine: docker-build-alpine:
docker build -t nicolabs/nicobot:dev-alpine -f alpine.Dockerfile . docker build -t nicolabs/nicobot:dev-alpine -f alpine.Dockerfile $(ARGS) .
docker-build-debian-signal:
docker build -t nicolabs/nicobot:dev-signal-debian -f signal-debian.Dockerfile .
docker-build-debian: docker-build-debian:
docker build -t nicolabs/nicobot:dev-debian -f debian.Dockerfile . docker build -t nicolabs/nicobot:dev-debian -f debian.Dockerfile $(ARGS) .
docker-build: docker-build-debian docker-build-debian-signal: docker-build-debian
docker build -t nicolabs/nicobot:dev-signal-debian --build-arg NICOBOT_BASE_IMAGE=nicolabs/nicobot:dev-debian -f signal-debian.Dockerfile $(ARGS) .
docker-build-all: docker-build-debian docker-build-debian-signal docker-build-alpine
compose-build:
cd aws && docker-compose -f transbot.docker-compose.yml build
compose-up:
cd aws && docker-compose -f transbot.docker-compose.yml up --build
test: test:
python3 -m unittest discover -v -s tests python3 -m unittest discover -v -s tests
@ -26,10 +32,10 @@ transbot:
python3 -m nicobot.transbot $(ARGS) python3 -m nicobot.transbot $(ARGS)
docker-askbot: docker-askbot:
docker run --rm -it nicolabs/nicobot:dev-signal-debian askbot $(ARGS) docker run --rm -it nicobot:dev-signal-debian askbot $(ARGS)
docker-transbot: docker-transbot:
docker run --rm -it nicolabs/nicobot:dev-signal-debian transbot $(ARGS) docker run --rm -it nicobot:dev-signal-debian transbot $(ARGS)
# All targets might be declared phony, since this Makefile is just a helper # All targets might be declared phony, since this Makefile is just a helper
# However most just don't match a file/directory so they will work without it # However most just don't match a file/directory so they will work without it

9
signal-debian.Dockerfile
View file

@ -1,3 +1,10 @@
############################
# Global variables
# Change this var to build from a local dev image for instance
ARG NICOBOT_BASE_IMAGE=nicolabs/nicobot:debian
############################ ############################
# STAGE 1 # STAGE 1
# #
@ -94,7 +101,7 @@ RUN zip -d /opt/signal-cli/lib/zkgroup-java-*.jar libzkgroup.so
# that inherits from the default nicobot (without signal support) # that inherits from the default nicobot (without signal support)
# #
FROM nicolabs/nicobot:debian FROM ${NICOBOT_BASE_IMAGE}
ARG TARGETPLATFORM ARG TARGETPLATFORM