diff --git a/docker-compose.devops.yml b/docker-compose.devops.yml index 343d5b0..ddb66aa 100644 --- a/docker-compose.devops.yml +++ b/docker-compose.devops.yml @@ -1,33 +1,10 @@ version: '2.2' services: - faulty-gitea: - image: gitea/gitea:latest - restart: always - privileged: true - environment: - - USER_UID=1000 - - USER_GID=1002 - - LETSENCRYPT_EMAIL=webmaster@faulty.nl - - LETSENCRYPT_HOST=gitea.faulty.nl - - VIRTUAL_HOST=gitea.faulty.nl - - VIRTUAL_PORT=3000 - volumes: - - /srv/faulty-gitea/data:/data/git - - /srv/faulty-gitea/config:/data/gitea - - /srv/faulty-gitea/other/ssh:/data/ssh - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - ports: - - "2222:22" - networks: - - proxy - - internal - gitlab: image: gitlab/gitlab-ce:latest restart: always - hostname: 'git.ixvd.net' + hostname: 'old-git.neo.ixvd.net' environment: GITLAB_OMNIBUS_CONFIG: | external_url 'https://git.ixvd.net' @@ -35,10 +12,10 @@ services: nginx['listen_port'] = 80 nginx['listen_https'] = false # temp ssh port - VIRTUAL_HOST: git.ixvd.net - LETSENCRYPT_HOST: git.ixvd.net + VIRTUAL_HOST: old-git.neo.ixvd.net + LETSENCRYPT_HOST: old-git.neo.ixvd.net ports: - - '22:22' + - '2223:22' volumes: - /srv/gitlab/config:/etc/gitlab - /srv/gitlab/data:/var/opt/gitlab @@ -63,8 +40,8 @@ services: environment: - USER_UID=1000 - USER_GID=1002 - - LETSENCRYPT_HOST=tmp.neo.ixvd.net - - VIRTUAL_HOST=tmp.neo.ixvd.net + - LETSENCRYPT_HOST=git.ixvd.net + - VIRTUAL_HOST=git.ixvd.net - VIRTUAL_PORT=3000 volumes: - /srv/gitea/data:/data/git @@ -73,7 +50,7 @@ services: - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: - - "2223:22" + - "22:22" networks: - proxy - internal