Merge branch 'revert-ecc1e85a' into 'develop'

Revert "Merge branch 'stevereis93-develop-patch-69094' into 'develop'"

See merge request sibmip/gateway!27

.gitlab-ci.yml

@@ -5,6 +5,10 @@ services:
 stages:
   - build
   - release
+  - deploy
+
+variables:
+  CONTAINER_BASE_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
 
 before_script:
   - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -12,27 +16,9 @@ before_script:
 build:
   stage: build
   script:
-    - docker build -t gateway-semantic ./api
+    - docker build -t $CONTAINER_BASE_IMAGE ./api
+    - docker push $CONTAINER_BASE_IMAGE
   only:
     - main
     - develop
     - /^release-.*$/
-
-release:
-  image: node:13
-  stage: release
-  before_script:
-    - docker build -t gateway-semantic ./api
-  only:
-    refs:
-    - main
-    - develop
-    - rc
-    # This matches maintenance branches
-    - /^(([0-9]+)\.)?([0-9]+)\.x/
-    # This matches pre-releases
-    - /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/ 
-  script:
-    - cd ./api
-    - npm install @semantic-release/gitlab @semantic-release/changelog @eclass/semantic-release-docker
-    - npx semantic-release

README.md

-[![semantic-release: angular](https://img.shields.io/badge/semantic--release-angular-e10079?logo=semantic-release)](https://github.com/semantic-release/semantic-release)

api/package.json

@@ -39,13 +39,9 @@
     "rxjs": "^7.2.0"
   },
   "devDependencies": {
-    "@eclass/semantic-release-docker": "^2.0.0",
     "@nestjs/cli": "^8.0.0",
     "@nestjs/schematics": "^8.0.0",
     "@nestjs/testing": "^8.0.0",
-    "@semantic-release/changelog": "^6.0.1",
-    "@semantic-release/git": "^10.0.1",
-    "@semantic-release/gitlab": "^7.0.4",
     "@types/express": "^4.17.13",
     "@types/jest": "^27.0.1",
     "@types/node": "^16.0.0",
@@ -81,58 +77,5 @@
     ],
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
-  },
-  "release": {
-    "plugins": [
-      "@semantic-release/commit-analyzer",
-      "@semantic-release/release-notes-generator",
-      "@semantic-release/changelog",
-      "@semantic-release/gitlab",
-      "@semantic-release/npm",
-      "@semantic-release/git",
-      [
-        "@eclass/semantic-release-docker",
-        {
-          "baseImageName": "gateway-semantic",
-          "registries": [
-            {
-              "url": "registry.gitlab.com",
-              "imageName": "registry.gitlab.com/sibmip/gateway-semantic-release",
-              "user": "GITLAB_USER",
-              "password": "GITLAB_TOKEN"
-            }
-          ],
-          "additionalTags": [
-            "next",
-            "beta"
-          ]
-        }
-      ]
-    ],
-    "branches": [
-      "main",
-      "+([0-9])?(.{+([0-9]),x}).x",
-      {
-        "name": "rc",
-        "prerelease": true
-      },
-      {
-        "name": "develop",
-        "prerelease": true
-      }
-    ],
-    "prepare": [
-      "@semantic-release/changelog",
-      "@semantic-release/npm",
-      {
-        "path": "@semantic-release/git",
-        "assets": [
-          "package.json",
-          "package-lock.json",
-          "../CHANGELOG.md"
-        ],
-        "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
-      }
-    ]
   }
 }