From 6903b27665221033e80b9b41c02dc283b35f3cdd Mon Sep 17 00:00:00 2001 From: kev Date: Mon, 16 Oct 2023 14:24:29 +0800 Subject: [PATCH] update semaphore --- README.md | 2 +- semaphore/arm64/Dockerfile | 27 --------------------------- semaphore/arm64/README.md | 13 ------------- semaphore/arm64/data/etc/config.json | 6 ------ semaphore/arm64/docker-compose.yml | 16 ---------------- semaphore/docker-compose.yml | 6 +++--- 6 files changed, 4 insertions(+), 66 deletions(-) delete mode 100644 semaphore/arm64/Dockerfile delete mode 100644 semaphore/arm64/README.md delete mode 100644 semaphore/arm64/data/etc/config.json delete mode 100644 semaphore/arm64/docker-compose.yml diff --git a/README.md b/README.md index 3f516b6..c14116c 100644 --- a/README.md +++ b/README.md @@ -460,7 +460,7 @@ A collection of delicious docker recipes. - [x] firefox - [x] vnc - [x] selenoid-ui -- [x] ansiblesemaphore/semaphore +- [x] semaphoreui/semaphore - [x] sentry - [x] atmoz/sftp - [x] quay.io/outline/shadowbox diff --git a/semaphore/arm64/Dockerfile b/semaphore/arm64/Dockerfile deleted file mode 100644 index b30baa5..0000000 --- a/semaphore/arm64/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -# -# Dockerfile for semaphore-arm64 -# - -FROM debian:bullseye -MAINTAINER EasyPi Software Foundation - -ARG APP_VERSION=2.8.77 -ARG APP_ARCH=arm64 -ARG APP_FILE=semaphore_${APP_VERSION}_linux_${APP_ARCH}.deb -ARG APP_URL=https://github.com/ansible-semaphore/semaphore -ARG APP_PACKAGE_URL=${APP_URL}/releases/download/v${APP_VERSION}/${APP_FILE} -ARG APP_WRAPPER_URL=${APP_URL}/raw/v${APP_VERSION}/deployment/docker/common/semaphore-wrapper - -RUN set -xe \ - && apt update \ - && apt install -y ansible netcat tini wget \ - && wget ${APP_PACKAGE_URL} -O ${APP_FILE} \ - && wget ${APP_WRAPPER_URL} -O /usr/bin/semaphore-wrapper \ - && chmod +x /usr/bin/semaphore-wrapper \ - && (dpkg -i ${APP_FILE} || apt -f install -y) \ - && rm -rf ${APP_FILE} /var/lib/apt/lists/* - -EXPOSE 3000 - -ENTRYPOINT ["/usr/bin/tini", "--"] -CMD ["/usr/bin/semaphore-wrapper", "/usr/bin/semaphore", "--config", "/etc/semaphore/config.json"] diff --git a/semaphore/arm64/README.md b/semaphore/arm64/README.md deleted file mode 100644 index a72c09c..0000000 --- a/semaphore/arm64/README.md +++ /dev/null @@ -1,13 +0,0 @@ -semaphore-arm64 -=============== - -## up and running - -```bash -$ docker-compose run --rm semaphore bash ->>> semaphore user add --admin --login admin --name admin --password admin --email admin@example.com ->>> git config --global pull.ff only ->>> exit -$ docker-compose up -d -$ curl http://localhost:3000 -``` diff --git a/semaphore/arm64/data/etc/config.json b/semaphore/arm64/data/etc/config.json deleted file mode 100644 index 212f561..0000000 --- a/semaphore/arm64/data/etc/config.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "dialect": "bolt", - "bolt": { - "host": "/var/lib/semaphore/semaphore.bolt" - } -} diff --git a/semaphore/arm64/docker-compose.yml b/semaphore/arm64/docker-compose.yml deleted file mode 100644 index e87b50e..0000000 --- a/semaphore/arm64/docker-compose.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: "3.8" -services: - semaphore: - image: easypi/semaphore-arm64 - command: ["semaphore", "server", "--config", "/etc/semaphore/config.json"] - ports: - - "3000:3000" - volumes: - - ./data/etc:/etc/semaphore - - ./data/var:/var/lib/semaphore - tmpfs: - - /tmp - environment: - - ANSIBLE_HOST_KEY_CHECKING=False - working_dir: /etc/semaphore - restart: unless-stopped diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 1fd9241..8226d77 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: semaphore: - image: semaphoreui/semaphore:v2.8.90 + image: semaphoreui/semaphore:v2.9.37 ports: - "3000:3000" volumes: @@ -11,7 +11,7 @@ services: - ./data/semaphore:/etc/semaphore environment: #SEMAPHORE_DB_DIALECT: bolt - #SEMAPHORE_DB_HOST: /var/lib/semaphore/database.boltdb + #SEMAPHORE_DB_PATH: /var/lib/semaphore SEMAPHORE_DB_DIALECT: postgres SEMAPHORE_DB_USER: semaphore SEMAPHORE_DB_PASS: semaphore @@ -27,7 +27,7 @@ services: restart: unless-stopped postgres: - image: postgres:14-alpine + image: postgres:16-alpine ports: - "5432:5432" volumes: