Merge branch 'trunk'

.bumpversion.toml

-[tool.bumpversion]
-commit = true
-current_version = "0.1.0"
-parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
-replace = "{new_version}"
-search = "{current_version}"
-serialize = [
-    "{major}.{minor}.{patch}",
-]
-tag = false
-
-[[tool.bumpversion.files]]
-filename = "CHANGELOG.md"
-replace = """## [Unreleased]
-
-## [{new_version}] - {now:%Y-%m-%d}
-"""
-search = """## [Unreleased]
-"""
+[tool.bumpversion]
+commit = true
+current_version = "0.2.0"
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
+replace = "{new_version}"
+search = "{current_version}"
+serialize = [
+    "{major}.{minor}.{patch}",
+]
+tag = false
+
+[[tool.bumpversion.files]]
+filename = "CHANGELOG.md"
+replace = """## [Unreleased]
+
+## [{new_version}] - {now:%Y-%m-%d}
+"""
+search = """## [Unreleased]
+"""

.gitlab-ci.yml

@@ -2,10 +2,6 @@ include:
   - remote: 'https://gitlab.com/swepy/cicd-templates/docker-build/-/raw/0.2.0/templates/docker-build.yml'
   - component: $CI_SERVER_HOST/swepy/cicd-templates/release-by-changelog/release-by-changelog@1.0.0
 
-#release_by_changelog:
-#    rules:
-#        -   if: $CI_PIPELINE_SOURCE != "pipeline" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
 docker_build:
   variables:
     TAG: $CI_COMMIT_SHA
@@ -14,9 +10,6 @@ docker_build:
     IMAGE_NAME: $DOCKER_USER/$REPOSITORY
     TARGET_IMAGE: $CI_REGISTRY_IMAGE:$TAG
     PROJECT_PATH: .
-  before_script:
-    - KANIKO_OPTIONS="--build-arg VERSION=3.20.2"
-    - echo "Kaniko options=$KANIKO_OPTIONS"
 
 docker_push:
   image: docker:latest
@@ -24,10 +17,12 @@ docker_push:
     - docker:dind
   variables:
     DOCKER_REPO: gitssh
-    TARGET_IMAGE: dorianturba/$DOCKER_REPO
+    TARGET_IMAGE: swepy/$DOCKER_REPO
     SRC_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
     VERSION: 3.20.2
   stage: deploy
+  tags:
+    - docker
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin lab.frogg.it:5050
   script:
@@ -36,22 +31,22 @@ docker_push:
 
     # Get the Ruff version by running the container
     - VERSION=${VERSION}
-    #        - MINOR=${VERSION%.*}
-    #        - MAJOR=${VERSION%%.*}
+    - MINOR=${VERSION%.*}
+    - MAJOR=${VERSION%%.*}
     - echo $VERSION
 
     # Tag the image
     - docker tag $SRC_IMAGE $TARGET_IMAGE:$VERSION
-    #        - docker tag $SRC_IMAGE $TARGET_IMAGE:$MINOR
-    #        - docker tag $SRC_IMAGE $TARGET_IMAGE:$MAJOR
-    #        - docker tag $SRC_IMAGE $TARGET_IMAGE:latest
+    - docker tag $SRC_IMAGE $TARGET_IMAGE:$MINOR
+    - docker tag $SRC_IMAGE $TARGET_IMAGE:$MAJOR
+    - docker tag $SRC_IMAGE $TARGET_IMAGE:latest
 
-    # Login to Docker Hub using DOCKER_AUTH_CONFIG
-    - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+    # Login to Docker Hub
+    - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USER" --password-stdin
     - docker push $TARGET_IMAGE:$VERSION
-  #        - docker push $TARGET_IMAGE:$MINOR
-  #        - docker push $TARGET_IMAGE:$MAJOR
-  #        - docker push $TARGET_IMAGE:latest
+    - docker push $TARGET_IMAGE:$MINOR
+    - docker push $TARGET_IMAGE:$MAJOR
+    - docker push $TARGET_IMAGE:latest
   rules:
-    - if: $CI_PIPELINE_SOURCE == "push"
+    - if: $CI_COMMIT_TAG == "3.20.2"
       when: manual

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.0] - 2024-09-01
+
+* Temporary version waiting for more automation
+
 ## [0.1.0] - 2024-08-13
 
 * Initial version

Dockerfile

@@ -38,9 +38,9 @@ LABEL maintainers="Dorian Turba <contact.docker.cblm4@simplelogin.com>"
 LABEL description="Lightweight image with git and ssh."
 LABEL version="3.20.2"
 LABEL license="MIT"
-LABEL org.opencontainers.image.source="https://lab.frogg.it/swepy/containers/ruff"
-LABEL org.opencontainers.image.source.gitlab_com="https://gitlab.com/swepy/containers/ruff"
-LABEL org.opencontainers.image.issues="https://lab.frogg.it/swepy/containers/ruff/-/issues"
+LABEL org.opencontainers.image.source="https://lab.frogg.it/swepy/containers/gitssh"
+LABEL org.opencontainers.image.source.gitlab_com="https://gitlab.com/swepy/containers/gitssh"
+LABEL org.opencontainers.image.issues="https://lab.frogg.it/swepy/containers/gitssh/-/issues"
 LABEL org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
 LABEL org.opencontainers.image.title="GitSSH"
 LABEL org.opencontainers.image.revision="3.20.2"

README.md

 # GitSSH Docker Image
 
-[//]: # ([![Pipeline](https://lab.frogg.it/swepy/containers/ruff/badges/main/pipeline.svg)](https://lab.frogg.it/swepy/containers/ruff/-/pipelines?ref=main))
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://lab.frogg.it/swepy/cicd-templates/ruff-docker-image/-/blob/main/LICENSE)
+[//]: # ([![Pipeline](https://lab.frogg.it/swepy/containers/gitssh/badges/main/pipeline.svg)](https://lab.frogg.it/swepy/containers/gitssh/-/pipelines?ref=main))
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://lab.frogg.it/swepy/containers/gitssh/-/blob/main/LICENCE.md)
 
 [![src froggit](https://img.shields.io/badge/src-Frogg.it-green)](https://lab.frogg.it/swepy/containers/gitssh)
 [![mirror gitlab](https://img.shields.io/badge/mirror-GitLab.com-orange)](https://gitlab.com/swepy/containers/gitssh)