fix

add l3
2022-09-07 10:05:29 +07:00 · 2022-09-06 15:18:38 +07:00 · 2022-09-06 15:11:35 +07:00
9 changed files with 143 additions and 110 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,5 @@
 data/gitlab-test/gitlab
 data/gitlab-test/postgresql
 data/gitlab-test/redis
-data/gitlab-test/gitlab-runner*

-Addons/gpg*
+Addons/
--- a/Addons/cleaner/.env.axample
+++ b/Addons/cleaner/.env.axample
@@ -1,7 +0,0 @@
-CLEAN_PERIOD=1800
-DELAY_TIME=86400
-KEEP_IMAGES=hub.bildme.ru/*
-KEEP_CONTAINERS=
-KEEP_CONTAINERS_NAMED=traefik*
-LOOP=true
-DEBUG=1
--- a/Addons/cleaner/docker-compose.yaml
+++ b/Addons/cleaner/docker-compose.yaml
@@ -1,16 +0,0 @@
-version: '3'
-services:
-  cleanup:
-    image: meltwater/docker-cleanup
-    restart: always
-    volumes:
-      - /var/lib/docker:/var/lib/docker:rw
-      - /var/run/docker.sock:/var/run/docker.sock:rw
-    environment:
-      - CLEAN_PERIOD=${CLEAN_PERIOD}
-      - DELAY_TIME=${DELAY_TIME}
-      - KEEP_IMAGES=${KEEP_IMAGES}
-      - KEEP_CONTAINERS=${KEEP_CONTAINERS}
-      - KEEP_CONTAINERS_NAMED=${KEEP_CONTAINERS_NAMED}
-      - LOOP=${LOOP}
-      - DEBUG=${DEBUG}
--- a/Addons/minio-srotage/storage-policy.json
+++ b/Addons/minio-srotage/storage-policy.json
@@ -1,14 +0,0 @@
-{
-	"Version": "2012-10-17",
-	"Statement": [
-		{
-			"Effect": "Allow",
-			"Action": [
-				"s3:*"
-			],
-			"Resource": [
-				"arn:aws:s3:::gitlab-storage/*"
-			]
-		}
-	]
-}
--- a/ci/.gitlab-ci.yml
+++ b/ci/.gitlab-ci.yml
@@ -0,0 +1,44 @@
+# полный реферерс тут
+# https://docs.gitlab.com/ee/ci/yaml/index.html
+# а тут доступные переменные
+# https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
+
+image: docker:20.10.16
+
+variables:
+  REGISTRY: hub.bildme.ru
+  IMAGE_NAME: $REGISTRY/$CI_PROJECT_PATH:latest
+  VERSION: 0.0.1
+
+stages:
+- build
+- deploy
+
+build_main:
+  stage: build
+  variables:
+    DOCKER_BASEIMAGE: golang:latest
+  before_script:
+    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $REGISTRY
+  script:
+    - docker build --pull --build-arg DOCKER_BASEIMAGE=${DOCKER_BASEIMAGE} -build-arg VERSION=${VERSION} -t $IMAGE_NAME .
+    - docker push $IMAGE_NAME
+  tags:
+   - docker
+
+deploy_prod:
+  image: hub.realmanual.ru/pub/openssh-client:latest
+  stage: deploy
+  variables:
+    DOCKER_SERVER: 192.168.9.199
+  before_script:
+    - eval $(ssh-agent -s)
+    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - ssh-keyscan ${DOCKER_SERVER} >> ~/.ssh/known_hosts
+    - chmod 644 ~/.ssh/known_hosts
+  script:
+    - ssh root@${DOCKER_SERVER} "docker rm -f main-go; docker pull hub.bildme.ru/firstgroup/go-site && docker run --rm --name main-go -p 3000:3000 hub.bildme.ru/firstgroup/go-site:latest"
+  tags:
+   - docker
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -0,0 +1,21 @@
+ARG DOCKER_BASEIMAGE
+FROM ${DOCKER_BASEIMAGE}
+
+LABEL maintainer="${DOCKER_MAINTAINER:-vasyakrg@gmail.com}"
+
+ADD ./app /app/
+WORKDIR /app/
+
+ARG VERSION=0.0.1
+ENV VERSION=${VERSION}
+
+RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=auto go build -a -ldflags="-X 'main.Version=v${VERSION}'" -installsuffix cgo -o main .
+
+
+FROM alpine
+ENV LANGUAGE="ru"
+COPY --from=0 /app/ /
+RUN apk add --no-cache ca-certificates &&\
+	chmod +x main
+
+CMD [ "./main" ]
--- a/ci/app/main.go
+++ b/ci/app/main.go
@@ -0,0 +1,24 @@
+package main
+
+import (
+    "net/http"
+    "os"
+    "fmt"
+)
+
+func indexHandler(w http.ResponseWriter, r *http.Request) {
+    w.Write([]byte("<h1>Hello World!</h1>"))
+}
+
+func main() {
+    port := os.Getenv("PORT")
+    if port == "" {
+        port = "3000"
+    }
+
+    fmt.Print("\nim run in http://127.0.0.1:", port)
+
+    mux := http.NewServeMux()
+    mux.HandleFunc("/", indexHandler)
+    http.ListenAndServe(":"+port, mux)
+}
--- a/ci/docker-run.sh
+++ b/ci/docker-run.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker pull hub.bildme.ru/firstgroup/go-site:latest
+docker run --rm --name main-go -p 3000:3000 hub.bildme.ru/firstgroup/go-site:latest
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -128,14 +128,14 @@ services:
      - REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer
      - REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry.crt
      - REGISTRY_STORAGE_DELETE_ENABLED=true
-      # - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/registry
-      - REGISTRY_STORAGE=s3
-      - REGISTRY_STORAGE_S3_ACCESSKEY
-      - REGISTRY_STORAGE_S3_SECRETKEY
-      - REGISTRY_STORAGE_S3_REGIONENDPOINT
-      - REGISTRY_STORAGE_S3_REGION
-      - REGISTRY_STORAGE_S3_BUCKET
-      - REGISTRY_STORAGE_CACHE_BLOBDESCRIPTOR=inmemory
+      - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/registry
+      # - REGISTRY_STORAGE=s3
+      # - REGISTRY_STORAGE_S3_ACCESSKEY
+      # - REGISTRY_STORAGE_S3_SECRETKEY
+      # - REGISTRY_STORAGE_S3_REGIONENDPOINT
+      # - REGISTRY_STORAGE_S3_REGION
+      # - REGISTRY_STORAGE_S3_BUCKET
+      # - REGISTRY_STORAGE_CACHE_BLOBDESCRIPTOR=inmemory
    expose:
      - 5000
    networks:
@@ -172,69 +172,47 @@ services:
    volumes:
      - ${SERVICE_DATA}/${SERVICE_NAME}/redis:/var/lib/redis:Z

-  runner_1: &runner
-    image: ${DOCKER_IMAGE_RUNNER}
-    container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_1
-    restart: always
-    depends_on:
-      - gitlab
-    command: --debug run --user=gitlab-runner --working-directory=/home/gitlab-runner
-    environment:
-      - CI_SERVER_URL=https://${GITLAB_HOST}
-      - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
-      - CI_SERVER_WITH_RUNNER=${CI_SERVER_WITH_RUNNER}
-      - RUNNER_TOKEN=${RUNNER_TOKEN}
-      - RUNNER_DESCRIPTION=gitab-runner_1
-      - RUNNER_EXECUTOR=docker
-      - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
-    networks:
-      - ${SERVICE_NETWORK}
-    volumes:
-      - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_1:/etc/gitlab-runner
-      - /var/run/docker.sock:/var/run/docker.sock
+  # runner_1: &runner
+  #   image: ${DOCKER_IMAGE_RUNNER}
+  #   container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_1
+  #   restart: always
+  #   depends_on:
+  #     - gitlab
+  #   command: --debug run --user=gitlab-runner --working-directory=/home/gitlab-runner
+  #   environment:
+  #     - CI_SERVER_URL=https://${GITLAB_HOST}
+  #     - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
+  #     - CI_SERVER_WITH_RUNNER=${CI_SERVER_WITH_RUNNER}
+  #     - RUNNER_TOKEN=${RUNNER_TOKEN}
+  #     - RUNNER_DESCRIPTION=gitab-runner_1
+  #     - RUNNER_EXECUTOR=docker
+  #     - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
+  #   networks:
+  #     - ${SERVICE_NETWORK}
+  #   volumes:
+  #     - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_1:/etc/gitlab-runner
+  #     - /var/run/docker.sock:/var/run/docker.sock

-  runner_2:
-    <<: *runner
-    container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_2
-    command: --debug run --user=gitlab-runner --working-directory=/home/gitlab-runner
-    environment:
-      - CI_SERVER_URL=https://${GITLAB_HOST}
-      - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
-      - CI_SERVER_WITH_RUNNER=${CI_SERVER_WITH_RUNNER}
-      - RUNNER_TOKEN=${RUNNER_TOKEN}
-      - RUNNER_DESCRIPTION=gitab-runner_2
-      - RUNNER_EXECUTOR=docker
-      - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
-    volumes:
-      - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_2:/etc/gitlab-runner
-      - /var/run/docker.sock:/var/run/docker.sock
+  # runner_2:
+  #   <<: *runner
+  #   container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_2
+  #   environment:
+  #     - RUNNER_DESCRIPTION=gitab-runner_2
+  #   volumes:
+  #     - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_2:/etc/gitlab-runner

-  runner_3:
-    <<: *runner
-    container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_3
-    environment:
-      - CI_SERVER_URL=https://${GITLAB_HOST}
-      - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
-      - CI_SERVER_WITH_RUNNER=${CI_SERVER_WITH_RUNNER}
-      - RUNNER_TOKEN=${RUNNER_TOKEN}
-      - RUNNER_DESCRIPTION=gitab-runner_3
-      - RUNNER_EXECUTOR=docker
-      - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
-    volumes:
-      - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_3:/etc/gitlab-runner
-      - /var/run/docker.sock:/var/run/docker.sock
+  # runner_3:
+  #   <<: *runner
+  #   container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_3
+  #   environment:
+  #     - RUNNER_DESCRIPTION=gitab-runner_3
+  #   volumes:
+  #     - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_3:/etc/gitlab-runner

-  runner_4:
-    <<: *runner
-    container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_4
-    environment:
-      - CI_SERVER_URL=https://${GITLAB_HOST}
-      - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
-      - CI_SERVER_WITH_RUNNER=${CI_SERVER_WITH_RUNNER}
-      - RUNNER_TOKEN=${RUNNER_TOKEN}
-      - RUNNER_DESCRIPTION=gitab-runner_4
-      - RUNNER_EXECUTOR=docker
-      - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
-    volumes:
-      - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_4:/etc/gitlab-runner
-      - /var/run/docker.sock:/var/run/docker.sock
+  # runner_4:
+  #   <<: *runner
+  #   container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_4
+  #   environment:
+  #     - RUNNER_DESCRIPTION=gitab-runner_4
+  #   volumes:
+  #     - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_4:/etc/gitlab-runner
Author	SHA1	Message	Date
Vassiliy Yegorov	dfd16e74c5	fix	2022-09-07 10:05:29 +07:00
Vassiliy Yegorov	429f1f3a6e	fix	2022-09-06 15:18:38 +07:00
Vassiliy Yegorov	2d0c627dc9	add l3	2022-09-06 15:11:35 +07:00