pmpavlov · pmpavlov · Apr 18, 2018 · Apr 18, 2018 · Apr 18, 2018 · Apr 18, 2018
diff --git a/README.md b/README.md
@@ -1,2 +1,3 @@
 # docker-stacks
 Templates for Docker stacks
+
diff --git a/artifactory/artifactory-ha.yml b/artifactory/artifactory-ha.yml
@@ -0,0 +1,99 @@
+version: '2'
+services:
+  postgresql:
+    image: docker.bintray.io/postgres:9.5.2
+    container_name: postgresql
+    ports:
+     - 5432:5432
+    environment:
+     - POSTGRES_DB=artifactory
+     # The following must match the DB_USER and DB_PASSWORD values passed to Artifactory
+     - POSTGRES_USER=artifactory
+     - POSTGRES_PASSWORD=password
+    volumes:
+     - /data/postgresql:/var/lib/postgresql/data
+    restart: always
+    ulimits:
+      nproc: 65535
+      nofile:
+        soft: 32000
+        hard: 40000
+  artifactory-node1:
+    image: docker.bintray.io/jfrog/artifactory-pro:5.10.4
+    container_name: artifactory-node1
+    ports:
+     - 8081:8081
+    depends_on:
+     - postgresql
+    links:
+     - postgresql
+    volumes:
+     - /data/artifactory/node1:/var/opt/jfrog/artifactory
+    environment:
+     - HA_IS_PRIMARY=true
+     - HA_MEMBERSHIP_PORT=10017
+     - DB_TYPE=postgresql
+     # The following must match the POSTGRES_USER and POSTGRES_PASSWORD values passed to PostgreSQL
+     - DB_USER=artifactory
+     - DB_PASSWORD=password
+     # Add extra Java options by uncommenting the following line
+     #- EXTRA_JAVA_OPTIONS=-Xmx4g
+    restart: always
+    ulimits:
+      nproc: 65535
+      nofile:
+        soft: 32000
+        hard: 40000
+  artifactory-node2:
+    image: docker.bintray.io/jfrog/artifactory-pro:5.10.4
+    container_name: artifactory-node2
+    ports:
+     - 8082:8081
+    depends_on:
+     - postgresql
+     - artifactory-node1
+    links:
+     - postgresql
+    # Must pass this to non primary so it can wait for primary to be up
+     - artifactory-node1
+    volumes:
+     - /data/artifactory/node2:/var/opt/jfrog/artifactory
+    environment:
+     - HA_IS_PRIMARY=false
+     - HA_MEMBERSHIP_PORT=10017
+     - DB_TYPE=postgresql
+     # The following must match the POSTGRES_USER and POSTGRES_PASSWORD values passed to PostgreSQL
+     - DB_USER=artifactory
+     - DB_PASSWORD=password
+     # Add extra Java options by uncommenting the following line
+     #- EXTRA_JAVA_OPTIONS=-Xmx4g
+    restart: always
+    ulimits:
+      nproc: 65535
+      nofile:
+        soft: 32000
+        hard: 40000
+  nginx:
+    image: docker.bintray.io/jfrog/nginx-artifactory-pro:5.10.4
+    container_name: nginx
+    ports:
+     - 80:80
+     - 443:443
+    depends_on:
+     - artifactory-node1
+     - artifactory-node2
+    links:
+     - artifactory-node1
+     - artifactory-node2
+    volumes:
+     - /data/nginx:/var/opt/jfrog/nginx
+    environment:
+     - ART_BASE_URL=http://artifactory-node1:8081/artifactory
+     - SSL=true
+    restart: always
+    ulimits:
+      nproc: 65535
+      nofile:
+        soft: 32000
+        hard: 40000
+
diff --git a/artifactory/docker-compose.yml b/artifactory/docker-compose.yml
@@ -0,0 +1,66 @@
+version: '3'
+services:
+  postgresql:
+    image: docker.bintray.io/postgres:9.5.2
+    container_name: postgresql
+    ports:
+     - 5432:5432
+    environment:
+     - POSTGRES_DB=artifactory
+     # The following must match the DB_USER and DB_PASSWORD values passed to Artifactory
+     - POSTGRES_USER=artifactory
+     - POSTGRES_PASSWORD=${POSTGRES_PSWRD}
+    volumes:
+     - /data/postgresql:/var/lib/postgresql/data
+    restart: always
+    ulimits:
+      nproc: 65535
+      nofile:
+        soft: 32000
+        hard: 40000
+  artifactory:
+    image: docker.bintray.io/jfrog/artifactory-pro:5.10.4
+    container_name: artifactory
+    ports:
+     - 8081:8081
+    depends_on:
+     - postgresql
+    links:
+     - postgresql
+    volumes:
+     - /data/artifactory:/var/opt/jfrog/artifactory
+    environment:
+     - DB_TYPE=postgresql
+     # The following must match the POSTGRES_USER and POSTGRES_PASSWORD values passed to PostgreSQL
+     - DB_USER=artifactory
+     - DB_PASSWORD=${POSTGRES_PSWRD}
+     # Add extra Java options by uncommenting the following line
+     #- EXTRA_JAVA_OPTIONS=-Xmx4g
+    restart: always
+    ulimits:
+      nproc: 65535
+      nofile:
+        soft: 32000
+        hard: 40000
+  nginx:
+    image: docker.bintray.io/jfrog/nginx-artifactory-pro:5.10.4
+    container_name: nginx
+    ports:
+     - 80:80
+     - 443:443
+    depends_on:
+     - artifactory
+    links:
+     - artifactory
+    volumes:
+     - /data/nginx:/var/opt/jfrog/nginx
+    environment:
+     - ART_BASE_URL=http://artifactory:8081/artifactory
+     - SSL=true
+    restart: always
+    ulimits:
+      nproc: 65535
+      nofile:
+        soft: 32000
+        hard: 40000
+
diff --git a/artifactory/docker-stack-nginx.yml b/artifactory/docker-stack-nginx.yml
@@ -0,0 +1,95 @@
+version: '3'
+
+services:
+
+  postgresql:
+    image: postgres
+    networks:
+      - default
+    ports:
+     - 5432:5432
+    environment:
+     - POSTGRES_DB=artifactory
+     # The following must match the DB_USER and DB_PASSWORD values passed to Artifactory
+     - POSTGRES_USER=artifactory
+     - POSTGRES_PASSWORD=password
+    #volumes:
+    # - postgres:/var/lib/postgresql/data
+    deploy:
+      mode: replicated
+      replicas: 1
+      restart_policy:
+        condition: on-failure
+        delay: 5s
+        max_attempts: 3    
+      placement:
+        constraints: [node.role != manager]
+
+  artifactory:
+    image: docker.bintray.io/jfrog/artifactory-oss:latest
+    networks:
+      - default
+      - traefik-net
+#    ports:
+#     - 8081:8081
+    depends_on:
+     - postgresql
+    deploy:
+      mode: replicated
+      replicas: 1
+      labels:
+        - "traefik.port=8081"
+        - "traefik.docker.network=traefik-net"
+        - "traefik.frontend.rule=Host:artifactory.traefik"      
+      restart_policy:
+        condition: on-failure
+        delay: 5s
+        max_attempts: 3
+      placement:
+        constraints: [node.role != manager]
+#    volumes:
+#     - artifactory:/var/opt/jfrog/artifactory
+    environment:
+     - DB_TYPE=postgresql
+     # The following must match the POSTGRES_USER and POSTGRES_PASSWORD values passed to PostgreSQL
+     - DB_USER=artifactory
+     - DB_PASSWORD=password
+     # Adding extra Java options by uncommenting the following line
+     #- EXTRA_JAVA_OPTIONS=-Xmx4g
+
+#  nginx:
+#    image: docker.bintray.io/jfrog/nginx-artifactory-pro:latest
+#    ports:
+#     - 8082:8082
+#     - 443:443
+#    depends_on:
+#     - artifactory
+#    deploy:
+#      mode: replicated
+#      replicas: 1
+#      labels:
+#        - "traefik.port=8082"
+#        - "traefik.frontend.entryPoints=http"
+#        - "traefik.docker.network=traefik-net"
+#        - "traefik.frontend.rule=Host:artifactory.traefik"
+#      restart_policy:
+#        condition: on-failure
+#        delay: 5s
+#        max_attempts: 3
+#      placement:
+#        constraints: [node.role != manager]
+#    volumes:
+#     - artifactory:/var/opt/jfrog/nginx
+#    environment:
+#     - ART_BASE_URL=http://artifactory:8081/artifactory
+#     - SSL=true
+
+#volumes:
+#  artifactory:
+networks:
+  traefik-net:
+    external: true
+  default:
+    driver: overlay
+    driver_opts:
+      encrypted: "true"
diff --git a/artifactory/docker-stack.yml b/artifactory/docker-stack.yml
@@ -1,11 +1,12 @@
-version: '3.6'
-
+version: '3.3'
 services:
 
-  postgres:
+  postgresql:
     image: postgres
-    ports:
-     - 5432:5432
+    networks:
+      - default
+#    ports:
+#     - 5432:5432
     environment:
      - POSTGRES_DB=artifactory
      # The following must match the DB_USER and DB_PASSWORD values passed to Artifactory
@@ -24,22 +25,27 @@ services:
         constraints: [node.role != manager]
 
   artifactory:
-    image: jfrog-docker-reg2.bintray.io/jfrog/artifactory-pro:latest
-    ports:
-     - 8081:8081
+    image: docker.bintray.io/jfrog/artifactory-oss:latest
+    networks:
+      - default
+      - traefik_traefik-net
     depends_on:
-     - postgres
+     - postgresql
     deploy:
       mode: replicated
       replicas: 1
+      labels:
+        - "traefik.port=8081"
+        - "traefik.docker.network=traefik_traefik-net"
+        - "traefik.frontend.rule=Host:artifactory.traefik"      
       restart_policy:
         condition: on-failure
         delay: 5s
         max_attempts: 3
       placement:
         constraints: [node.role != manager]
-    volumes:
-     - artifactory:/var/opt/jfrog/artifactory
+#    volumes:
+#     - artifactory:/var/opt/jfrog/artifactory
     environment:
      - DB_TYPE=postgresql
      # The following must match the POSTGRES_USER and POSTGRES_PASSWORD values passed to PostgreSQL
@@ -48,27 +54,12 @@ services:
      # Adding extra Java options by uncommenting the following line
      #- EXTRA_JAVA_OPTIONS=-Xmx4g
 
-  nginx:
-    image: jfrog.bintray.com/reg2/jfrog/nginx-artifactory-pro:latest
-    ports:
-     - 80:80
-     - 443:443
-    depends_on:
-     - artifactory
-    deploy:
-      mode: replicated
-      replicas: 1
-      restart_policy:
-        condition: on-failure
-        delay: 5s
-        max_attempts: 3
-      placement:
-        constraints: [node.role != manager]
-    volumes:
-     - artifactory:/var/opt/jfrog/nginx
-    environment:
-     - ART_BASE_URL=http://artifactory:8081/artifactory
-     - SSL=true
-
-volumes:
-  artifactory:
+#volumes:
+#  artifactory:
+networks:
+  traefik_traefik-net:
+    external: true
+  default:
+    driver: overlay
+    driver_opts:
+      encrypted: "true"
diff --git a/gitlab/Dockerfile b/gitlab/Dockerfile
@@ -0,0 +1,10 @@
+FROM gitlab/gitlab-ce:latest
+
+MAINTAINER Pavlov <ppavlov@dontmail.me>
+
+LABEL name="gitlab-ce"
+LABEL version="2.107"
+LABEL maintainer "ppavlov@dontmail.me"
+LABEL architecture="x86_64"
+
+ADD gitlab.rb /etc/gitlab/gitlab.rb