gitlab-com-mangadex-pub/mangadex_at_home
1
0
Fork 1
mirror of https://gitlab.com/mangadex-pub/mangadex_at_home.git synced 2024-01-19 02:48:37 +00:00
Code Releases Activity

Docker compose changes

Browse source
This commit is contained in:
Georgi Yankov 2023-04-07 20:51:29 +00:00 committed by carbotaniuman
parent c9a5548770
commit 1984a994a4
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitlab-ci.yml
View file

@ -60,6 +60,7 @@ Docker Build:
- docker build . -t $CI_REGISTRY_IMAGE:$BASE_TAG - docker build . -t $CI_REGISTRY_IMAGE:$BASE_TAG
- docker push $CI_REGISTRY_IMAGE:$BASE_TAG - docker push $CI_REGISTRY_IMAGE:$BASE_TAG
.docker_push: &docker_push .docker_push: &docker_push
image: docker:20.10.8 image: docker:20.10.8
services: services:
@ -71,11 +72,13 @@ Docker Build:
before_script: before_script:
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY} - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
- export BASE_TAG="git-$CI_COMMIT_SHORT_SHA" - export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
- export SHORT_TAG="$(echo $CI_COMMIT_TAG | cut -d "." -f1)"
script: script:
- docker pull $CI_REGISTRY_IMAGE:$BASE_TAG - docker pull $CI_REGISTRY_IMAGE:$BASE_TAG
- docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$NEW_TAG - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$NEW_TAG
- docker push $CI_REGISTRY_IMAGE:$NEW_TAG - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$SHORT_TAG
- docker push $CI_REGISTRY_IMAGE --all-tags
Push Latest: Push Latest:
<<: *docker_push <<: *docker_push

2
docker/README.md
View file

@ -12,6 +12,8 @@ Once installed, you can check that it works by opening a command prompt and runn
## Run as a standalone container ## Run as a standalone container
*Note* Changes to `the docker-compose.yml` are coming, and as such, this instruction page will get reworked a bit.
Use either a specific image, preferrably the [latest image published](https://gitlab.com/mangadex-pub/mangadex_at_home/container_registry/1200259) Use either a specific image, preferrably the [latest image published](https://gitlab.com/mangadex-pub/mangadex_at_home/container_registry/1200259)
> While it might work, using `registry.gitlab.com/mangadex-pub/mangadex_at_home:latest` is a bad idea as we do not guarantee forward-compatibility > While it might work, using `registry.gitlab.com/mangadex-pub/mangadex_at_home:latest` is a bad idea as we do not guarantee forward-compatibility

7
docker/docker-compose.yml
View file

@ -4,7 +4,7 @@ services:
mangadex-at-home: mangadex-at-home:
container_name: mangadex-at-home container_name: mangadex-at-home
image: "registry.gitlab.com/mangadex-pub/mangadex_at_home:<version>" image: "registry.gitlab.com/mangadex-pub/mangadex_at_home:2"
ports: ports:
- 443:443 - 443:443
volumes: volumes:
@ -12,7 +12,6 @@ services:
- ./data/cache/:/mangahome/data/ - ./data/cache/:/mangahome/data/
environment: environment:
JAVA_TOOL_OPTIONS: "-Xms1G -Xmx1G -XX:+UseShenandoahGC -Xss512K" JAVA_TOOL_OPTIONS: "-Xms1G -Xmx1G -XX:+UseShenandoahGC -Xss512K"
privileged: true
command: [ command: [
"bash", "bash",
"-c", "-c",
@ -31,7 +30,7 @@ services:
prometheus: prometheus:
container_name: prometheus container_name: prometheus
image: prom/prometheus:v2.24.1 image: prom/prometheus:v2.34.0
user: "root" user: "root"
group_add: group_add:
- 0 - 0
@ -50,7 +49,7 @@ services:
grafana: grafana:
container_name: grafana container_name: grafana
image: grafana/grafana:7.4.0 image: grafana/grafana:8.4.3
user: "root" user: "root"
group_add: group_add:
- 0 - 0