fix

ci/.gitlab-ci.yml

@@ -7,28 +7,79 @@ image: docker:20.10.16
 
 variables:
   REGISTRY: hub.bildme.ru
+  GITLAB: git.bildme.ru
   IMAGE_NAME: $REGISTRY/$CI_PROJECT_PATH:latest
-  VERSION: 0.0.1
+  RELEASE_NAME: go-site
+  VERSION: 0.0.5
+  PACKAGE_REGISTRY_URL: https://${GITLAB}/api/v4/projects/${CI_PROJECT_ID}/packages/generic/${RELEASE_NAME}/${VERSION}
 
 stages:
 - build
+- push
+- artifacts
+- release
 - deploy
 
+.rules: &rules
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+
 build_main:
   stage: build
-  variables:
+  image: golang:latest
-    DOCKER_BASEIMAGE: golang:latest
+  <<: *rules
+  script:
+    - cd app
+    - CGO_ENABLED=0 GOOS=linux GO111MODULE=auto go build -a -ldflags="-X 'main.Version=v${VERSION}'" -installsuffix cgo -o go-site .
+  artifacts:
+    paths:
+      - app/go-site
+  tags:
+   - docker
+
+push_image:
+  stage: push
+  <<: *rules
   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 build -t $IMAGE_NAME .
     - docker push $IMAGE_NAME
   tags:
    - docker
 
+package:
+  stage: release
+  <<: *rules
+  before_script:
+    - apk add curl
+  script:
+    - FILE_NAME=${RELEASE_NAME}
+    - cd app
+    - 'curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ${FILE_NAME} ${PACKAGE_REGISTRY_URL}/${FILE_NAME}'
+
+release:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  <<: *rules
+  script:
+    - echo "Release ${RELEASE_NAME}"
+  release:
+    name: 'Release $VERSION'
+    description: 'Release $VERSION'
+    tag_name: '$VERSION'
+    ref: '$CI_COMMIT_SHA'
+    assets:
+      links:
+        - name: '${RELEASE_NAME}'
+          url: '${PACKAGE_REGISTRY_URL}/${RELEASE_NAME}'
+
 deploy_prod:
-  image: hub.realmanual.ru/pub/openssh-client:latest
   stage: deploy
+  image: hub.realmanual.ru/pub/openssh-client:latest
+  <<: *rules
   variables:
     DOCKER_SERVER: 192.168.9.199
   before_script:
@@ -39,6 +90,18 @@ deploy_prod:
     - 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"
+    - ssh root@${DOCKER_SERVER} "docker rm -f main-go; docker pull hub.bildme.ru/firstgroup/go-site && docker run -d --rm --name main-go -p 3000:3000 hub.bildme.ru/firstgroup/go-site:latest"
+  environment:
+    name: production
+    url: http://${DOCKER_SERVER}:3000/
   tags:
    - docker
+  # when:
+  #   manual
+
+
+### Что можно добавить ?
+### - версионирование тегов
+### - возможность откатываться назад на версию (на нужную версию через ввод переменной)
+### - тестирование кода линтером перед деплоем
+### - возможность деплоя на два окружения (сценарий, когда сначала на стейдж, потом в ручную по тригеру на прод)

ci/Dockerfile

@@ -1,21 +1,10 @@
-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" ]
+COPY app/go-site /app/
+WORKDIR /app
+
+RUN apk add --no-cache ca-certificates &&\
+	chmod +x go-site
+
+CMD [ "./go-site" ]

ci/app/main.go

@@ -6,8 +6,10 @@ import (
     "fmt"
 )
 
+var Version = "0.0.1"
+
 func indexHandler(w http.ResponseWriter, r *http.Request) {
-    w.Write([]byte("<h1>Hello World!</h1>"))
+    w.Write([]byte("<h1>Hello World, im ver:"+Version+" !</h1>"))
 }
 
 func main() {
@@ -16,7 +18,7 @@ func main() {
         port = "3000"
     }
 
-    fmt.Print("\nim run in http://127.0.0.1:", port)
+    fmt.Print("\nVersion:", Version, ", Im run in http://127.0.0.1:", port)
 
     mux := http.NewServeMux()
     mux.HandleFunc("/", indexHandler)