.gitlab-ci.yml

@@ -18,10 +18,10 @@ include:
 # Global variables
 variables:
   DOCKER_HADOLINT_ARGS: "--ignore=DL3008 --ignore=DL3015"
-  WPL_GOLANG_VERSION: 1.23.2
-  DART_SASS_VERSION: 1.80.6
+  WPL_GOLANG_VER: 1.23.2
+  DART_SASS_VER: 1.80.6
   DART_SASS_HOST: "chewtoy.dog.wolfspyre.io"
-  DOCKER_BUILD_ARGS: "--cache-ttl=6h --build-arg $CI_PROJECT_URL --build-arg $CI_PROJECT_URL  --build-arg DART_SASS_VERSION=$DART_SASS_VERSION  --build-arg DART_SASS_HOST=$DART_SASS_HOST"
+  DOCKER_BUILD_ARGS: "--cache-ttl=6h --build-arg CI_PROJECT_URL=$CI_PROJECT_URL  --build-arg  WPL_GOLANG_VER=$WPL_GOLANG_VER --build-arg DART_SASS_VER=$DART_SASS_VER  --build-arg DART_SASS_HOST=$DART_SASS_HOST"
   DOCKER_TRIVY_ARGS: "--ignore-unfixed --vuln-type os"
 
 

CHANGELOG.md

-# [2.2.0](https://gitlab.wolfspyre.io/wpl_containers/util/golang_extended/compare/2.1.0...2.2.0) (2024-11-03)
+## [2.2.1](https://gitlab.wolfspyre.io/wpl_containers/util/golang_extended/compare/2.2.0...2.2.1) (2024-11-03)
 
 
-### Features
+### Bug Fixes
 
-* **logo:** add new logo ([c55fb57](https://gitlab.wolfspyre.io/wpl_containers/util/golang_extended/commit/c55fb576cca95c037088cb5ff089731d61e0d48e))
-
-# [2.1.0](https://gitlab.wolfspyre.io/wpl_containers/util/golang_extended/compare/2.0.0...2.1.0) (2024-11-03)
-
-
-### Features
-
-* **release:** adjust releaserc ([f984262](https://gitlab.wolfspyre.io/wpl_containers/util/golang_extended/commit/f9842625d454f7580297ba6c851d4727700367ed))
-
-# [2.0.0](https://gitlab.wolfspyre.io/wpl_containers/util/golang_extended/compare/1.0.0...2.0.0) (2024-11-02)
-
-
-* 🔧 add dart BREAKING CHANGE: perhaps this is 'unbreaking' ? ([1c68b6e](https://gitlab.wolfspyre.io/wpl_containers/util/golang_extended/commit/1c68b6e6050e790ab6b9347e9c7b738ceb37e2fb))
-
-
-### BREAKING CHANGES
-
-* perhaps this is 'unbreaking' ?
-
-# 1.0.0 (2024-11-02)
-
-
-### chore
-
-* **release:** 1.0.0 ([657c41e](https://gitlab.wolfspyre.io/wpl_containers/util/golang_extended/commit/657c41ec7b899a0395cca652ab8ad6bbdbc9de0c))
-
-
-### BREAKING CHANGES
-
-* **release:** some stuff
-BREAKING CHANGES: some other stuff
-MAJORVER: 1.0.0?
-MAJOR VERSION: 1.0.0
-fuck this shit.
+* **variables:** fix var smell ([3d07a53](https://gitlab.wolfspyre.io/wpl_containers/util/golang_extended/commit/3d07a53240aa07e6a4d24781f22b4f8d93ea7881))
 
 # Changelog
-## 1.0.0 (2024-11-01) 
+## 1.0.0 (2024-11-02) 
 ### STUFF!

Dockerfile

 FROM library/golang:bookworm
 ARG WPL_GOLANG_VER=1.23.2
-ARG DARTSASSVERSION=1.80.5
+ARG DART_SASS_VER=1.80.5
 ARG CI_PROJECT_URL
-ARG DARTSASSHOST=github.com
+ARG DART_SASS_HOST=github.com
 ENV WPL_GOLANG_VER=$WPL_GOLANG_VER
-ENV DART_SASS_VERSION=$DARTSASSVERSION
-ENV DART_SASS_HOST=$DARTSASSHOST
+ENV DART_SASS_VER=$DART_SASS_VER
+ENV DART_SASS_HOST=$DART_SASS_HOST
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN GV=$(go version|sed -e 's/go version go//' -e 's/ lin.*//'); if [[ "${GV}" != "${WPL_GOLANG_VER}" ]]; then echo "EXPECTED GoLang version: ${WPL_GOLANG_VER}. Golang Version Present: ${GV}."; exit 1; fi
 RUN apt-get update -y; apt-get install -y pandoc ruby python3 asciidoctor ruby-asciidoctor npm && apt-get clean && rm -rf /var/cache/apt
-RUN wget -q https://$DART_SASS_HOST/sass/dart-sass/releases/download/${DART_SASS_VERSION}/dart-sass-${DART_SASS_VERSION}-linux-x64.tar.gz -O - | tar xzf - dart-sass/ && mv dart-sass/* bin/ && rm -rf dart-sass&& chmod 777 bin/sass
-RUN npm install -g sass@${DART_SASS_VERSION} bootstrap@latest
+RUN wget -q https://$DART_SASS_HOST/sass/dart-sass/releases/download/${DART_SASS_VER}/dart-sass-${DART_SASS_VER}-linux-x64.tar.gz -O - | tar xzf - dart-sass/ && mv dart-sass/* bin/ && rm -rf dart-sass&& chmod 777 bin/sass
+RUN npm install -g sass@${DART_SASS_VER} bootstrap@latest
 LABEL name="golang_extended" \
       description="Container for testing hugo build" \
       golangver=$GV \
       artifactsource=$DART_SASS_HOST \
-      dartsassver=$DART_SASS_VERSION \
+      dartsassver=$DART_SASS_VER \
       url=$CI_PROJECT_URL   \
       maintainer="gitlab@wolfspaw.com"
-#RUN wget -q https://$DART_SASS_HOST/sass/dart-sass/releases/download/${DART_SASS_VERSION}/dart-sass-${DART_SASS_VERSION}-linux-x64.tar.gz -O /tmp/${DART_SASS_VERSION}.tgz && ls -la /tmp/ && tar xzf /tmp/${DART_SASS_VERSION}.tgz  dart-sass/sass && mv dart-sass/sass bin/ && rm -rf dart-sass /tmp/${DART_SASS_VERSION}.tgz
\ No newline at end of file
+#RUN wget -q https://$DART_SASS_HOST/sass/dart-sass/releases/download/${DART_SASS_VER}/dart-sass-${DART_SASS_VER}-linux-x64.tar.gz -O /tmp/${DART_SASS_VER}.tgz && ls -la /tmp/ && tar xzf /tmp/${DART_SASS_VER}.tgz  dart-sass/sass && mv dart-sass/sass bin/ && rm -rf dart-sass /tmp/${DART_SASS_VER}.tgz
\ No newline at end of file

divine_latest_go_release.sh

 #!/usr/bin/env bash
-CURRENT_GOLANG=$(awk '/WPL_GOLANG_VERSION/ {print $2}' .gitlab-ci.yml| sed -e "s,\',,g")
+CURRENT_GOLANG=$(awk '/WPL_GOLANG_VER/ {print $2}' .gitlab-ci.yml| sed -e "s,\',,g")
 LATEST_GOLANG=$(curl -sq https://go.dev/VERSION?m=text |awk '/go/ {print $1}'|sed -e 's/go//')
 CHEWTOY_GOLANG=$(curl -sq https://chewtoy.dog.wolfspyre.io/golang/latest_cache || echo 0.0.0)
 INTCURRENT=${CURRENT_GOLANG//\.}