Remove Python and go-bindata (cesanta#302)

Author: techknowlogick

.github/workflows/docker-nightly.yml

@@ -21,20 +21,13 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Get Version
+      - name: Get Build Data
         id: info
         run: |
           echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-
-      - name: make generate build
-        run: |
-          /usr/bin/env python3 -m pip install GitPython
-          cd auth_server
-          make deps generate build
-
-      - name: cp ca-certificates.crt
-        run: |
-          cp /etc/ssl/certs/ca-certificates.crt auth_server/ca-certificates.crt
+          export TEMP=$(cd auth_server && go run gen_version.go)
+          echo ::set-output name=version::$(echo -n $TEMP | awk '{print $1}')
+          echo ::set-output name=build_id::$(echo -n $TEMP | awk '{print $2}')
 
       - name: Determine Docker Tag
         uses: haya14busa/action-cond@v1
@@ -73,6 +66,9 @@ jobs:
           platforms: linux/amd64
           push: ${{ github.event_name == 'push' }}
           tags: cesanta/docker_auth:${{ steps.imagetag.outputs.value }}
+          build-args: |
+            VERSION=${{ steps.info.outputs.version }}
+            BUILD_ID=${{ steps.info.outputs.build_id }}
           labels: |
             org.opencontainers.image.title=${{ github.event.repository.name }}
             org.opencontainers.image.description=${{ github.event.repository.description }}

.github/workflows/go_test.yml

@@ -14,12 +14,6 @@ jobs:
         go-version: ${{ matrix.go-version }}
     - name: Checkout code
       uses: actions/checkout@v2
-    - name: Install deps
-      run: |
-        python -m pip install --upgrade pip
-        pip install GitPython
-        cd auth_server
-        python gen_version.py
     - name: Test
       run: |
         cd auth_server

auth_server/Dockerfile

@@ -1,6 +1,20 @@
-FROM busybox
-ADD auth_server /docker_auth/
-COPY ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+FROM golang:1.16-alpine3.13 as build
+
+ARG VERSION
+ENV VERSION "${VERSION}"
+ARG BUILD_ID
+ENV BUILD_ID "${BUILD_ID}"
+ARG CGO_EXTRA_CFLAGS
+
+RUN apk add -U --no-cache ca-certificates make git gcc musl-dev
+
+COPY . /build
+WORKDIR /build
+RUN make build
+
+FROM alpine:3.13
+COPY --from=build /build/auth_server /docker_auth/
+COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 ENTRYPOINT ["/docker_auth/auth_server"]
 CMD ["/config/auth_config.yml"]
 EXPOSE 5001

auth_server/Makefile

@@ -1,42 +1,14 @@
 MAKEFLAGS += --warn-undefined-variables
 IMAGE ?= cesanta/docker_auth
-COMPRESS_BINARY ?= false
-CA_BUNDLE = /etc/ssl/certs/ca-certificates.crt
-VERSION = $(shell cat version.txt)
-
-BUILDER_IMAGE ?= golang:1.16-alpine3.13
+VERSION ?= $(shell go run ./gen_version.go | awk '{print $$1}')
+BUILD_ID ?= $(shell go run ./gen_version.go | awk '{print $$2}')
 
 .PHONY: %
 
 all: build
 
-deps:
-	go install github.com/go-bindata/go-bindata/go-bindata@latest
-
-generate:
-	go generate \
-	  github.com/cesanta/docker_auth/auth_server \
-	  github.com/cesanta/docker_auth/auth_server/authn/... \
-	  github.com/cesanta/docker_auth/auth_server/authz/... \
-	  github.com/cesanta/docker_auth/auth_server/mgo_session/... \
-	  github.com/cesanta/docker_auth/auth_server/server/...
-
 build:
-	CGO_ENABLED=0 go build -v --ldflags=--s
-
-ca-certificates.crt:
-	cp $(CA_BUNDLE) .
-
-build-release: ca-certificates.crt
-	docker run --rm -v $(PWD)/..:/src \
-	  $(BUILDER_IMAGE) sh -x -c "\
-	    apk update && apk add git make py3-pip && pip install GitPython && \
-	    cd /src/auth_server && \
-	    umask 0 && \
-	    go install github.com/go-bindata/go-bindata/go-bindata@latest && \
-	    make generate && \
-	    CGO_ENABLED=0 go build -v --ldflags=--s"
-	@echo === Built version $$(cat version.txt) ===
+	go build -v -ldflags="-X 'main.Version=${VERSION}' -X 'main.BuildID=${BUILD_ID}'"
 
 auth_server:
 	@echo
@@ -45,7 +17,7 @@ auth_server:
 	@exit 1
 
 docker-build:
-	docker build -t $(IMAGE):latest .
+	docker build --build-arg VERSION="${VERSION}" --build-arg BUILD_ID="${BUILD_ID}" -t $(IMAGE):latest .
 	docker tag $(IMAGE):latest $(IMAGE):$(VERSION)
 
 docker-tag-%:

auth_server/README.md

@@ -1,17 +1,9 @@
 ### Building local image
 
 ```
-# copy ca certificate to /etc/ssl/certs/ca-certificates.crt
-pip install gitpython
 mkdir -p /var/tmp/go/src/github.com/cesanta
 cd /var/tmp/go/src/github.com/cesanta
 git clone https://github.com/cesanta/docker_auth.git
 cd docker_auth/auth_server
-export GOPATH=/var/tmp/go
-export PATH=$PATH:$GOPATH/bin
-# download dependencies
-make deps
-# build source
-make generate
-make
+make docker-build
 ```

auth_server/authn/authn.go

@@ -16,4 +16,7 @@
 
 package authn
 
-//go:generate go-bindata -pkg authn -modtime 1 -mode 420 -nocompress data/
+import "embed"
+
+//go:embed data/*
+var static embed.FS