From e0ed79e3f8243e1f0a6bd8119b6a9bdfd80bad58 Mon Sep 17 00:00:00 2001
From: Michael Thaler <michael.thaler@conesphere.com>
Date: Thu, 25 Aug 2022 10:03:11 +0000
Subject: [PATCH 01/12] Update pack_package_tgz.sh
---
pack_package_tgz.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pack_package_tgz.sh b/pack_package_tgz.sh
index 162f73f..c8bc6b2 100755
--- a/pack_package_tgz.sh
+++ b/pack_package_tgz.sh
@@ -14,7 +14,7 @@ chmod go-w -R buildroot/usr/bin/mokey || exit $?
chmod go-w -R buildroot/etc/mokey || exit $?
chmod go-w -R buildroot/usr/bin || exit $?
chmod go-w -R buildroot/usr/share/mokey || exit $?
-chmod go=rwx buildroot/usr/bin/Python || exit $?
+chmod go-rwx -R buildroot/usr/bin/Python || exit $?
cd buildroot || exit $?
tar cvfz ../mokey.tgz . || exit $?
--
GitLab
From f7d2eec47626e85c8f70479dd394ebb74056c57f Mon Sep 17 00:00:00 2001
From: Michael Thaler <michael.thaler@conesphere.com>
Date: Fri, 18 Oct 2024 11:52:42 +0000
Subject: [PATCH 02/12] remove credentials file
---
Python/credentials.json | 1 -
1 file changed, 1 deletion(-)
delete mode 100644 Python/credentials.json
diff --git a/Python/credentials.json b/Python/credentials.json
deleted file mode 100644
index 4cbe9b8..0000000
--- a/Python/credentials.json
+++ /dev/null
@@ -1 +0,0 @@
-{"username":"admin","pwd":"SilencedUninvitedPrimpSwaggerJazz"}
\ No newline at end of file
--
GitLab
From ec07aa2781f53fe02b811bdca3cf20d305e9ad4c Mon Sep 17 00:00:00 2001
From: Michael Thaler <michael.thaler@conesphere.com>
Date: Fri, 18 Oct 2024 14:47:39 +0200
Subject: [PATCH 03/12] switch to new and working go container
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dfbd10c..8e6a987 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,8 @@ build-mokey: # This job runs in the build stage, which runs first.
stage: build
tags:
- build
- image: registry.conesphere.cloud/conesphere/docker/hub/golang:latest
+ image: registry.conesphere.cloud/conesphere/podman/hub/debian.go:stable
+
script:
- 'if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then CI_COMMIT_REF_NAME=latest ; fi'
- golint -set_exit_status
--
GitLab
From 28cb26571b7e6d394fcad05c55f90570e802ddbe Mon Sep 17 00:00:00 2001
From: Michael Thaler <michael.thaler@conesphere.com>
Date: Fri, 18 Oct 2024 14:50:37 +0200
Subject: [PATCH 04/12] add dummy credentials file
---
Python/credentials.json | 1 +
1 file changed, 1 insertion(+)
create mode 100644 Python/credentials.json
diff --git a/Python/credentials.json b/Python/credentials.json
new file mode 100644
index 0000000..681bee0
--- /dev/null
+++ b/Python/credentials.json
@@ -0,0 +1 @@
+{"username":"DUMMY","pwd":"DUMMY"}
--
GitLab
From 9281c9eb929cd80ed965fae803d77b163d2b1474 Mon Sep 17 00:00:00 2001
From: Michael Thaler <michael.thaler@conesphere.com>
Date: Fri, 18 Oct 2024 17:13:38 +0200
Subject: [PATCH 05/12] replace golint with golangci-lint run
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e6a987..1e94924 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ build-mokey: # This job runs in the build stage, which runs first.
script:
- 'if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then CI_COMMIT_REF_NAME=latest ; fi'
- - golint -set_exit_status
+ - golangci-lint run
# - ls -alh ./goipa
- go build .
- strip mokey
--
GitLab
From 2af8a74f5070a2ae14c5a47bf7069eec6298f6b1 Mon Sep 17 00:00:00 2001
From: Michael Thaler <michael.thaler@conesphere.com>
Date: Fri, 18 Oct 2024 17:16:25 +0200
Subject: [PATCH 06/12] switch to go vet ./ and go staticcheck
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e94924..d255ac9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,8 +11,8 @@ build-mokey: # This job runs in the build stage, which runs first.
script:
- 'if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then CI_COMMIT_REF_NAME=latest ; fi'
- - golangci-lint run
- # - ls -alh ./goipa
+ - go vet ./
+ - staticcheck ./
- go build .
- strip mokey
- ./pack_package_tgz.sh
--
GitLab
From 14896ff7531cf85475c8193a461c8f92107a4dff Mon Sep 17 00:00:00 2001
From: Michael Thaler <michael.thaler@conesphere.com>
Date: Fri, 18 Oct 2024 17:19:41 +0200
Subject: [PATCH 07/12] switch staticcheck to go-staticcheck
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d255ac9..ad467da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build-mokey: # This job runs in the build stage, which runs first.
script:
- 'if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then CI_COMMIT_REF_NAME=latest ; fi'
- go vet ./
- - staticcheck ./
+ - go-staticcheck ./
- go build .
- strip mokey
- ./pack_package_tgz.sh
--
GitLab
From 1383ba670ab111353999ac6f5a1f6d72bd1d3178 Mon Sep 17 00:00:00 2001
From: Michael Thaler <michael.thaler@conesphere.com>
Date: Fri, 18 Oct 2024 17:26:54 +0200
Subject: [PATCH 08/12] build once without staticcheck
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad467da..8691c60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build-mokey: # This job runs in the build stage, which runs first.
script:
- 'if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then CI_COMMIT_REF_NAME=latest ; fi'
- go vet ./
- - go-staticcheck ./
+ #- go-staticcheck ./
- go build .
- strip mokey
- ./pack_package_tgz.sh
--
GitLab
From 4179fb55f19464e678150eb3af673f75e8cea923 Mon Sep 17 00:00:00 2001
From: Michael Thaler <michael.thaler@conesphere.com>
Date: Fri, 18 Oct 2024 17:27:39 +0200
Subject: [PATCH 09/12] re-enable go-staticcheck
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8691c60..ad467da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build-mokey: # This job runs in the build stage, which runs first.
script:
- 'if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then CI_COMMIT_REF_NAME=latest ; fi'
- go vet ./
- #- go-staticcheck ./
+ - go-staticcheck ./
- go build .
- strip mokey
- ./pack_package_tgz.sh
--
GitLab
From 7b4256397e443fc19c003b5e597cf381ec9fc4c9 Mon Sep 17 00:00:00 2001
From: Michael Thaler <michael.thaler@conesphere.com>
Date: Fri, 18 Oct 2024 17:29:06 +0200
Subject: [PATCH 10/12] re-disable go staticcheck
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad467da..8691c60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build-mokey: # This job runs in the build stage, which runs first.
script:
- 'if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then CI_COMMIT_REF_NAME=latest ; fi'
- go vet ./
- - go-staticcheck ./
+ #- go-staticcheck ./
- go build .
- strip mokey
- ./pack_package_tgz.sh
--
GitLab
From f81904b0a8dfb0661174802bd04d94e0aff36fbc Mon Sep 17 00:00:00 2001
From: Michael Thaler <michael.thaler@conesphere.com>
Date: Fri, 18 Oct 2024 17:44:47 +0200
Subject: [PATCH 11/12] re-enable go linter as we now have a first container
built
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8691c60..ad467da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build-mokey: # This job runs in the build stage, which runs first.
script:
- 'if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then CI_COMMIT_REF_NAME=latest ; fi'
- go vet ./
- #- go-staticcheck ./
+ - go-staticcheck ./
- go build .
- strip mokey
- ./pack_package_tgz.sh
--
GitLab
From 13ddd7e1eda8becfff749581dff2e31a07f3c25f Mon Sep 17 00:00:00 2001
From: Michael Thaler <michael.thaler@conesphere.com>
Date: Wed, 22 Jan 2025 12:52:11 +0000
Subject: [PATCH 12/12] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad467da..57d03b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ build-mokey: # This job runs in the build stage, which runs first.
stage: build
tags:
- build
- image: registry.conesphere.cloud/conesphere/podman/hub/debian.go:stable
+ image: registry.conesphere.cloud/conesphere/docker/hub/golang:stable
script:
- 'if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then CI_COMMIT_REF_NAME=latest ; fi'
--
GitLab