Skip to content

Commit

Permalink
Update to LocalVC
Browse files Browse the repository at this point in the history
  • Loading branch information
dfuchss committed Jul 15, 2024
1 parent 812409c commit c4a6f19
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 33 deletions.
8 changes: 2 additions & 6 deletions .env
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
ARTEMIS_VERSION=7.4.2
GITLAB_VERSION=15.7.3-ce.0

PROFILES=core,prod,jenkins,gitlab,artemis,scheduling,saml2

GITLAB_HTTP_PORT=8880
GITLAB_SSH_PORT=222
PROFILES=core,prod,jenkins,localvc,artemis,docker,scheduling,saml2
JENKINS_HTTP_PORT=7780

28 changes: 4 additions & 24 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ services:
depends_on:
artemis:
condition: service_started
gitlab:
condition: service_started
jenkins:
condition: service_started
ports:
Expand All @@ -30,24 +28,6 @@ services:
networks:
- artemis-net

gitlab:
build:
context: ./docker/gitlab
args:
GITLAB_VERSION: ${GITLAB_VERSION}
restart: unless-stopped
volumes:
- ./data/gitlab/config:/etc/gitlab
- ./data/gitlab/logs:/var/log/gitlab
- ./data/gitlab/data:/var/opt/gitlab
ports:
- "${GITLAB_HTTP_PORT}:80"
- "${GITLAB_SSH_PORT}:22"
environment:
- GITLAB_OMNIBUS_CONFIG=prometheus_monitoring['enable'] = false; nginx['listen_port'] = 80; gitlab_rails['monitoring_whitelist'] = ['0.0.0.0/0']
networks:
- artemis-net

jenkins:
image: jenkins/jenkins:lts
restart: unless-stopped
Expand All @@ -69,10 +49,10 @@ services:
depends_on:
artemis-db:
condition: service_started
gitlab:
condition: service_healthy
jenkins:
condition: service_started
ports:
- 8080:8080
volumes:
- ./data/artemis-be/config:/opt/artemis/config
- ./data/artemis-be/data:/opt/artemis/data
Expand All @@ -84,14 +64,14 @@ services:
- artemis-net

artemis-db:
image: mysql:8.0.23
image: mysql:8
restart: unless-stopped
volumes:
- ./data/artemis-db:/var/lib/mysql
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=Artemis
command: mysqld --lower_case_table_names=1 --skip-ssl --character_set_server=utf8mb4 --collation-server=utf8mb4_unicode_ci --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --collation-server=utf8mb4_unicode_ci --explicit_defaults_for_timestamp
networks:
- artemis-net
cap_add:
Expand Down
3 changes: 0 additions & 3 deletions docker/gitlab/Dockerfile

This file was deleted.

0 comments on commit c4a6f19

Please sign in to comment.