diff --git a/templates/GitLab-CE/0/README.md b/templates/GitLab-CE/0/README.md deleted file mode 100644 index 4cc1b1b..0000000 --- a/templates/GitLab-CE/0/README.md +++ /dev/null @@ -1 +0,0 @@ -# Gitlab CE \ No newline at end of file diff --git a/templates/GitLab-CE/0/docker-compose.yml b/templates/GitLab-CE/0/docker-compose.yml deleted file mode 100644 index 18fcfbd..0000000 --- a/templates/GitLab-CE/0/docker-compose.yml +++ /dev/null @@ -1,36 +0,0 @@ -version: '2' -services: - gitlab-ce: - image: gitlab/gitlab-ce:latest - dns: - - 1.1.1.1 - - 1.0.0.1 - environment: - GITLAB_OMNIBUS_CONFIG: | - external_url 'https://${TRAEFIK_HOST}:${WEB_PORT}' - hostname: ${TRAEFIK_HOST} - labels: - io.rancher.container.pull_image: always - {{- if .Values.HOST_LABEL}} - io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} - {{- end}} - {{- if .Values.TRAEFIK_HOST}} - traefik.enable: true - traefik.frontend.rule: Host:${TRAEFIK_HOST} - traefik.port: "80" - traefik.frontend.entryPoints: http,https - traefik.frontend.headers.forceSTSHeader: true - traefik.frontend.headers.SSLRedirect: true - traefik.frontend.headers.STSPreload: true - traefik.frontend.headers.STSSeconds: 15552000 - {{- else}} - traefik.enable: false - {{- end}} - ports: - - "${WEB_PORT}:80" -# - "${SSH_PORT}:22" - restart: on-failure - volumes: - - /RancherCattleConfig/${DATA_DIR}/Config:/etc/gitlab - - /RancherCattleConfig/${DATA_DIR}/Logs:/var/log/gitlab - - /RancherCattleData/${DATA_DIR}/Data:/var/opt/gitlab \ No newline at end of file diff --git a/templates/GitLab/0/README.md b/templates/GitLab/0/README.md new file mode 100644 index 0000000..cc2a8c6 --- /dev/null +++ b/templates/GitLab/0/README.md @@ -0,0 +1,6 @@ +# GitLab (Community Edition) + + +## Manually Adding More Environment Variables With Omnibus + +[Available Options Located Here](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template) \ No newline at end of file diff --git a/templates/GitLab/0/docker-compose.yml b/templates/GitLab/0/docker-compose.yml new file mode 100644 index 0000000..663d260 --- /dev/null +++ b/templates/GitLab/0/docker-compose.yml @@ -0,0 +1,44 @@ +version: '2' + +services: + gitlab: + image: gitlab/gitlab-ce:latest + dns: + - 1.1.1.1 + - 1.0.0.1 + environment: + GITLAB_OMNIBUS_CONFIG: | + external_url 'https://${TRAEFIK_HOST}' + gitlab_rails['gitlab_shell_ssh_port'] = 1022 + hostname: ${TRAEFIK_HOST} + labels: + io.rancher.container.pull_image: always + {{- if .Values.HOST_LABEL}} + io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} + {{- end}} + traefik.enable: true + ### Start Web Segment + traefik.web.frontend.entryPoints: http,https + traefik.web.frontend.headers.forceSTSHeader: true + traefik.web.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information) + traefik.web.frontend.headers.SSLRedirect: true + traefik.web.frontend.headers.STSPreload: true + traefik.web.frontend.headers.STSSeconds: 15552000 + traefik.web.frontend.rule: Host:${TRAEFIK_HOST} + traefik.web.port: "80" + ### End Web Segment + ### Start SSH Segment + traefik.ssh.frontend.entryPoints: ssh + traefik.ssh.frontend.rule: Host:${TRAEFIK_HOST} + traefik.ssh.port: "22" + ### End SSH Segment + ports: + - "${WEB_PORT}:80" + - "1022:22" + restart: on-failure + volumes: + - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system + - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system + - /RancherCattle/${DATA_DIR}/Config:/etc/gitlab + - /RancherCattle/${DATA_DIR}/Logs:/var/log/gitlab + - /RancherCattle/${DATA_DIR}/Data:/var/opt/gitlab \ No newline at end of file diff --git a/templates/GitLab-CE/0/rancher-compose.yml b/templates/GitLab/0/rancher-compose.yml similarity index 89% rename from templates/GitLab-CE/0/rancher-compose.yml rename to templates/GitLab/0/rancher-compose.yml index ec18038..83ad24f 100644 --- a/templates/GitLab-CE/0/rancher-compose.yml +++ b/templates/GitLab/0/rancher-compose.yml @@ -20,9 +20,8 @@ catalog: label: "Public Host Domain" description: | The host that Traefik will use to provide public access. - Leaving this empty will disable Traefik on this stack. default: "subdomain.domain.tld" - required: false + required: true type: string - variable: "WEB_PORT" @@ -37,6 +36,6 @@ catalog: label: "Data Directory" description: | The directory to store persistent data for the stack. - default: "Personal/Gitlab-CE" + default: "Personal/GitLab" required: true type: string \ No newline at end of file diff --git a/templates/GitLab-CE/catalogIcon-gitlab.svg b/templates/GitLab/catalogIcon-gitlab.svg similarity index 100% rename from templates/GitLab-CE/catalogIcon-gitlab.svg rename to templates/GitLab/catalogIcon-gitlab.svg diff --git a/templates/GitLab-CE/config.yml b/templates/GitLab/config.yml similarity index 82% rename from templates/GitLab-CE/config.yml rename to templates/GitLab/config.yml index 11c46a9..0e70d03 100644 --- a/templates/GitLab-CE/config.yml +++ b/templates/GitLab/config.yml @@ -1,4 +1,4 @@ -name: Gitlab (Community Edition) +name: GitLab (Community Edition) description: | Status: NOT READY version: latest