Merge pull request #8 from datastack-net/feature/go

Porting to Go

Author: boukeversteegh

.cache/.gitkeep

@@ -1,11 +1,13 @@
 DEFAULT_ARCH=x86_64
 ALPINE_VERSION=3.14.2
+AB_VERSION=latest
 AWS_VERSION=2.4.24
 DEFAULT_BASE_IMAGE=alpine
 DEFAULT_BASE_IMAGE_VERSION=${ALPINE_VERSION}
 DEFAULT_BASE=${DEFAULT_BASE_IMAGE}:${DEFAULT_BASE_IMAGE_VERSION}
 DOCTL_VERSION=1.70.0
 DOTNET_VERSION=6.0
+GIT_VERSION=2.32.0
 GH_VERSION=2.5.2
 GO_VERSION=1.17.8
 HELM_VERSION=3.8.1

dockerized.env renamed to .env

@@ -0,0 +1,52 @@
+name: Compile and Test
+on: [push]
+
+jobs:
+  CompileAndTest:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-20.04
+#          - windows-2022
+#          - macos-10.15
+      max-parallel: 1
+      fail-fast: true
+    steps:
+      # region mac
+      - name: Install Docker
+        if:  runner.os == 'macOS'
+        uses: docker-practice/actions-setup-docker@master
+      # endregion
+
+      - name: Checkout Dockerized
+        uses: actions/checkout@v2
+
+      - run: bin/dockerized --compile --help
+        shell: bash
+
+      - run: bin/dockerized go version
+        shell: bash
+
+      - name: "Test: version from environment variable"
+        run: GO_VERSION=1.16.15 bin/dockerized go version | grep "go1.16.15"
+        shell: bash
+
+      - name: "Test: version from dockerized.env"
+        run: |
+          mkdir -p project
+          cd project
+          echo 'GO_VERSION=1.17.8' > dockerized.env
+          ../bin/dockerized go version | grep "1.17.8"
+        shell: bash
+
+      # region windows
+      - if: runner.os == 'windows'
+        name: "dockerized --compile (cmd)"
+        shell: cmd
+        run: bin/dockerized --compile
+      - if: runner.os == 'windows'
+        name: "dockerized --compile (powershell)"
+        shell: cmd
+        run: bin/dockerized --compile
+      # endregion

.github/workflows/test.yml

@@ -1 +1,3 @@
-config.env
+build/*
+.cache/*
+.go/*

.gitignore

@@ -16,7 +16,7 @@ services:
 - `image: golang:latest` specifies the docker image to use. You can find these on [Docker Hub](https://hub.docker.com/).
 - `entrypoint` is the command to run when the service starts.
 
-That's it. Now you can run `dockerize go`.
+That's it. Now you can run `dockerized go`.
 
 ## Configurable version
 
@@ -25,7 +25,7 @@ Let's make sure users can choose the version of the command.
 Check the current version of the command. Often with `<command> --version` or `<command> version`.
 
 ```shell
-dockerize go version
+dockerized go version
 > go version go1.17.8 linux/amd64
 ```
 
@@ -38,7 +38,7 @@ Replace the version tag `latest` with `${GO_VERSION}`:
     entrypoint: [ "go" ]
 ```
 
-Set the global default version in [dockerized.env](dockerized.env):
+Set the global default version in [.env](.env):
 
 ```dotenv
 GO_VERSION=1.17.8
@@ -50,19 +50,19 @@ GO_VERSION=1.17.8
 
 ```bash
 # Create a branch:
-dockerize git checkout -b fork
+dockerized git checkout -b fork
 
 # Commit your changes:
-dockerize git commit -am "Add go"
+dockerized git commit -am "Add go"
 
 # Authenticate to github:
-dockerize gh auth login
+dockerized gh auth login
 ```
 
 - Choose SSH, and Browser authentication
 - See [gh](apps/gh/Readme.md) for more information.
 
 ```bash
 # Create a PR:
-dockerize gh pr create
+dockerized gh pr create
 ```

DEV.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 DataStack.net
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE

@@ -1,98 +1,100 @@
 #!/usr/bin/env bash
+case "$OSTYPE" in
+msys | cygwin)
+  PWD_ARGS="-W"
+  ;;
+esac
+
 # CONSTANTS
-DOCKERIZED_ENV_FILE_NAME="dockerized.env"
-DOCKERIZED_ROOT=$(realpath $(dirname "$BASH_SOURCE")/..)
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd $PWD_ARGS)
+DOCKERIZED_ROOT=$(dirname "$SCRIPT_DIR")
 DOCKERIZED_COMPOSE_FILE="${DOCKERIZED_ROOT}/docker-compose.yml"
-DOCKERIZED_ENV_FILE="${DOCKERIZED_ROOT}/${DOCKERIZED_ENV_FILE_NAME}"
-HOST_HOME="$HOME"
+DOCKERIZED_BINARY="${DOCKERIZED_ROOT}/build/dockerized"
 
-# OPTIONS
-DOCKERIZED_OPT_VERBOSE=
-
-# RUNTIME VARIABLES
-HOST_PWD=
-HOST_HOSTNAME=$(hostname)
-HOST_DIR_NAME=$(basename "$PWD")
-HOST_DIR_NAME=${HOST_DIR_NAME%/}
-SERVICE_NAME=
-SERVICE_ARGS=
+# region COMPILE DOCKERIZED
+DOCKERIZED_COMPILE=
+if [ "$1" == "--compile" ] || [ "$1" == "--compile=docker" ]; then
+  DOCKERIZED_COMPILE="docker"
+  shift
+fi
 
-# PARSE OPTIONS
-if [ "$1" == "-v" ]; then
-    DOCKERIZED_OPT_VERBOSE="1"
-    shift
+if [ "$1" == "--compile=host" ]; then
+  DOCKERIZED_COMPILE="host"
+  shift
 fi
 
-case "$(uname -s)" in
-CYGWIN* | MINGW32* | MSYS* | MINGW*)
-  HOST_PWD=$(pwd -W)
+case "$OSTYPE" in
+msys | cygwin)
+  GOOS=windows
+  ;;
+darwin*)
+  GOOS=darwin
+  ;;
+# Operating systems below not tested. Logic based on:
+#  - https://github.com/dylanaraps/neofetch/issues/433
+#  - https://gist.github.com/asukakenji/f15ba7e588ac42795f421b48b8aede63
+openbsd*)
+  GOOS=openbsd
+  ;;
+freebsd*)
+  GOOS=freebsd
+  ;;
+netbsd*)
+  GOOS=netbsd
+  ;;
+solaris*)
+  GOOS=solaris
   ;;
+# default
 *)
-  HOST_PWD=$(pwd)
+  GOOS=linux
   ;;
 esac
 
-SERVICE_ARGS="$@"
-SERVICE_NAME="$1"
+case "$(uname -m)" in
+x86_64)
+  GOARCH=amd64
+  ;;
+i*86)
+  GOARCH=386
+  ;;
 
-function dotenv() {
-  FILE="$1"
+esac
 
-  if [ ! -f "$FILE" ]; then
-    return
+if [ $DOCKERIZED_COMPILE ] || [ ! -f "$DOCKERIZED_BINARY" ]; then
+  echo "Compiling dockerized..." >&2
+  GIT_COMMIT=$(cd $DOCKERIZED_ROOT; git rev-list -1 HEAD)
+  GO_BUILD_ARGS="-ldflags '-X main.Version=${GIT_COMMIT}'"
+  GO_LDFLAGS="-X main.Version=${GIT_COMMIT}"
+  if [ $DOCKERIZED_COMPILE == "docker" ]; then
+    docker run \
+      --rm \
+      --entrypoint=go \
+      -e "GOOS=${GOOS}" \
+      -v "${DOCKERIZED_ROOT}:/src" \
+      -v "${DOCKERIZED_ROOT}/build:/build" \
+      -v "${DOCKERIZED_ROOT}/.cache:/go/pkg" \
+      -w //src \
+      "golang:1.17.8" \
+      build -ldflags "$GO_LDFLAGS" -o //build/ lib/dockerized.go
+  else
+    (
+    cd "$DOCKERIZED_ROOT"
+    go build -ldflags "$GO_LDFLAGS" -o build/ lib/dockerized.go
+    )
   fi
 
-  if [ "$DOCKERIZED_OPT_VERBOSE" ]; then
-    echo -e "\033[0;32mLoading environment from $FILE\033[0m"
+  if [ $? -ne 0 ]; then
+    echo "Failed to compile dockerized" >&2
+    exit 1
   fi
 
-  set -o allexport
-  source "$FILE"
-  set +o allexport
-}
-
-function findUp() {
-  local FILE="$1"
-  local DIR="$2"
-  while [ ! -f "$DIR/$FILE" ]; do
-    DIR=$(dirname "$DIR")
-    if [ "$(realpath "$DIR")" == "$(realpath "$(dirname "$DIR")")" ]; then
-      return 1
-    fi
-  done
-  echo "$DIR/$FILE"
-}
-
-function loadEnvironment() {
-  local CUSTOM_ENV_FILE=$(findUp "$DOCKERIZED_ENV_FILE_NAME" "$HOST_PWD")
-  dotenv "$HOME/$DOCKERIZED_ENV_FILE_NAME"
-  dotenv "$CUSTOM_ENV_FILE"
-}
-
-loadEnvironment
-
-SERVICE_EXISTS=$(docker-compose -f "$DOCKERIZED_COMPOSE_FILE" config --services | grep -w $SERVICE_NAME)
-
-if [ -z "$SERVICE_EXISTS" ]; then
-  echo -e "\033[0;31mCommand $1 is not fully supported. Trying r.j3ss.co/$SERVICE_NAME instead." >&2
-  echo -e "See https://github.com/jessfraz/dockerfiles/blob/master/README.md for more information.\033[0m" >&2
-  shift
-  docker \
-    run --rm -it \
-    -w "//host/$HOST_DIR_NAME" \
-    -v "$HOST_PWD://host/$HOST_DIR_NAME" \
-    -e "HOST_HOSTNAME=$HOST_HOSTNAME" \
-    r.j3ss.co/$SERVICE_NAME \
-    "$@"
-
-  exit $?
+  if [ $# -eq 0 ]; then
+    echo "Compiled dockerized" >&2
+    exit 0
+  fi
 fi
+# endregion
 
-docker-compose \
- --env-file "$DOCKERIZED_ENV_FILE" \
- -f "$DOCKERIZED_COMPOSE_FILE" \
- run --rm \
- -e "HOST_HOSTNAME=$HOST_HOSTNAME" \
- -v "$HOST_PWD://host/$HOST_DIR_NAME" \
- -w "//host/$HOST_DIR_NAME" \
- $SERVICE_ARGS
+# RUN DOCKERIZED:
+"$DOCKERIZED_BINARY" "$@"