Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add path prefixed gitlab-ce instance #905

Closed
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
046888f
Add path prefixed gitlab-ce instance
aryanpingle Sep 10, 2024
c9e0c51
Add http/s explanations
aryanpingle Sep 11, 2024
f90b13b
feat: Inline gitlab.rb configs into compose
aryanpingle Sep 17, 2024
3271231
refactor: Use variables for gitlab/.env
aryanpingle Sep 17, 2024
8738a2f
feat: Make gitlab use local directory
aryanpingle Sep 17, 2024
a664587
fix: Fix typo in gitlab .gitignore
aryanpingle Sep 17, 2024
eea7580
feat: Revert gitlab-ce to 16.4.1-ce.0
aryanpingle Sep 17, 2024
f47c36a
fix: Fix forward-auth DNS issue
aryanpingle Sep 17, 2024
41b3256
Refactor gitlab compose
aryanpingle Sep 18, 2024
53a6db4
Revert server env file modifications
aryanpingle Sep 18, 2024
b9c1bdc
Add README to gitlab directory
aryanpingle Sep 18, 2024
2367c3e
style: Fix style issue in gitlab README
aryanpingle Sep 18, 2024
3e8504b
Rename gitlab compose file (+ remove obsolete version label)
aryanpingle Sep 20, 2024
bc13e26
Add INTEGRATION.md
aryanpingle Sep 23, 2024
7b2c5a6
Adds code to serve DTaaS over https on localhost
prasadtalasila Sep 23, 2024
c8b40f6
Add OAuth token configuration step to integration guide
aryanpingle Sep 23, 2024
2cf7e3f
Fixes the localhost integration of gitlab
prasadtalasila Sep 25, 2024
6defdc6
Merge 'pr-905' into feature/distributed-demo
aryanpingle Sep 25, 2024
2aeb139
Edit INTEGRATION.md for localhost installations
aryanpingle Sep 25, 2024
141a143
Update client.dockerfile
aryanpingle Oct 2, 2024
7ac6581
Revert accidental commit "Update client.dockerfile"
aryanpingle Oct 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/config/client/env.js
aryanpingle marked this conversation as resolved.
Show resolved Hide resolved
aryanpingle marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if (typeof window !== 'undefined') {
REACT_APP_WORKBENCHLINK_JUPYTERNOTEBOOK: '',

REACT_APP_CLIENT_ID: '1be55736756190b3ace4c2c4fb19bde386d1dcc748d20b47ea8cfb5935b8446c',
REACT_APP_AUTH_AUTHORITY: 'https://gitlab.foo.com/',
REACT_APP_AUTH_AUTHORITY: 'https://foo.com/gitlab',
REACT_APP_REDIRECT_URI: 'https://foo.com/Library',
REACT_APP_LOGOUT_REDIRECT_URI: 'https://foo.com/',
REACT_APP_GITLAB_SCOPES: 'openid profile read_user read_repository api',
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/.env.server
aryanpingle marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
DTAAS_DIR='/Users/<Username>/DTaaS'
SERVER_DNS='foo.com'
OAUTH_URL='https://gitlab.foo.com'
OAUTH_URL='https://foo.com/gitlab'
CLIENT_ID='xx'
CLIENT_SECRET='xx'
OAUTH_SECRET='random-secret-string'
Expand Down
1 change: 1 addition & 0 deletions deploy/docker/compose.server.secure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ services:
restart: unless-stopped
volumes:
- "${DTAAS_DIR}/deploy/docker/conf.server:/conf"
- "${DTAAS_DIR}/deploy/docker/resolv.conf:/etc/resolv.conf"
environment:
- LOG_LEVEL=trace
- DEFAULT_PROVIDER=generic-oauth
Expand Down
2 changes: 2 additions & 0 deletions deploy/docker/resolv.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nameserver 8.8.8.8 # Google DNS

51 changes: 0 additions & 51 deletions deploy/services/gitlab.js

This file was deleted.

7 changes: 0 additions & 7 deletions deploy/services/gitlab.yml

This file was deleted.

6 changes: 6 additions & 0 deletions deploy/services/gitlab/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
GITLAB_HOME='/Users/<Username>/DTaaS/deploy/services/gitlab'
SERVER_DNS='foo.com'
URL_SCHEME='https'
aryanpingle marked this conversation as resolved.
Show resolved Hide resolved
ROUTER_ENTRYPOINTS='web-secure' # set this to 'web' if URL_SCHEME='http'
prasadtalasila marked this conversation as resolved.
Show resolved Hide resolved
ENABLE_TLS='true' # set this to 'false' if URL_SCHEME='http'
GITLAB_IMAGE='gitlab/gitlab-ce:16.4.1-ce.0'
4 changes: 4 additions & 0 deletions deploy/services/gitlab/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
logs/
data/
config/

Empty file.
Empty file.
35 changes: 35 additions & 0 deletions deploy/services/gitlab/docker-compose.yml
aryanpingle marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Reference: https://docs.gitlab.com/ee/install/docker/installation.html
version: '3.6'
aryanpingle marked this conversation as resolved.
Show resolved Hide resolved
services:
gitlab:
image: ${GITLAB_IMAGE}
container_name: gitlab
restart: always
hostname: ${SERVER_DNS}
environment:
GITLAB_OMNIBUS_CONFIG: |
external_url '${URL_SCHEME}://${SERVER_DNS}/gitlab'
prasadtalasila marked this conversation as resolved.
Show resolved Hide resolved
gitlab_rails['gitlab_shell_ssh_port'] = 2424
nginx['listen_port'] = 80
nginx['enable'] = true
nginx['listen_https'] = false
nginx['redirect_http_to_https'] = false
letsencrypt['enable'] = false
volumes:
- '${GITLAB_HOME}/config:/etc/gitlab'
- '${GITLAB_HOME}/logs:/var/log/gitlab'
- '${GITLAB_HOME}/data:/var/opt/gitlab'
shm_size: '256m'
labels:
- "traefik.enable=true"
- "traefik.http.routers.gitlab.entryPoints=${ROUTER_ENTRYPOINTS}"
- "traefik.http.routers.gitlab.rule=Host(`${SERVER_DNS}`)&&PathPrefix(`/gitlab`)"
- "traefik.http.routers.gitlab.service=gitlab"
- "traefik.http.services.gitlab.loadbalancer.server.port=80"
- "traefik.http.routers.gitlab.tls=${ENABLE_TLS}"
aryanpingle marked this conversation as resolved.
Show resolved Hide resolved
networks:
- dtaas-frontend

networks:
dtaas-frontend:
external: true
Empty file.