cleanup

README.md

@@ -10,7 +10,7 @@ Building images remotely allows to work from locations with slow internet upstre
 
 ## Use case 1
 
-Using docker cli to build and push an image.
+Using docker cli to build and push an image from within gitlab ci, without a running docker daemon.
 
 ``` bash
 export DOCKER_HOST=tcp://wedding:2376
@@ -19,7 +19,7 @@ docker build -t registry/user/image:tag .
 
 ## Use case 2
 
-Using tilt to set up and test an environment.
+Using tilt to set up and test an environment from within gitlab ci, without a running docker daemon.
 
 ``` bash
 export DOCKER_HOST=tcp://wedding:2376
@@ -28,11 +28,11 @@ tilt ci
 
 ## Use case 3
 
-Using tilt to set up a development environment without a running local docker.
+Using tilt to set up a development environment without running a local docker daemon.
 
 _Terminal 1_
 ``` bash
-kubectl -n wedding port-forward svc/wedding 2376:2376
+kubectl port-forward svc/wedding 2376:2376
 ```
 
 _Terminal 2_

Tiltfile

@@ -4,15 +4,15 @@ allow_k8s_contexts(['test', 'ci'])
 load('ext://min_tilt_version', 'min_tilt_version')
 min_tilt_version('0.15.0') # includes fix for auto_init+False with tilt ci
 
-include('./services/Tiltfile')
+include('./service-dependencies/Tiltfile')
 include('./tests/Tiltfile')
 
 k8s_yaml('deployment/config.yaml')
 k8s_yaml('deployment/kubernetes.yaml')
 
 if os.environ.get('PROD', '') ==  '':
   docker_build(
-    'wedding-image',
+    'davedamoon/wedding:latest',
     '.',
     dockerfile='deployment/Dockerfile',
     target='build-env',
@@ -38,7 +38,7 @@ if os.environ.get('PROD', '') ==  '':
   )
 else:
   docker_build(
-    'backend-image',
+    'davedamoon/wedding:latest',
     '.',
     dockerfile='deployment/Dockerfile',
     build_args={"SOURCE_BRANCH":"development", "SOURCE_COMMIT":"development"},

deployment/Dockerfile

@@ -15,15 +15,16 @@ RUN go mod download
 ARG SOURCE_BRANCH
 ARG SOURCE_COMMIT
 
+ENV CGO_ENABLED=0
+ENV GOOS=linux
+
 COPY cmd cmd
 COPY pkg pkg
-RUN CGO_ENABLED=0 \
-    GOOS=linux \
-    go install -ldflags="-X main.gitRef=${SOURCE_BRANCH} -X main.gitHash=${SOURCE_COMMIT}" -installsuffix cgo ./cmd/wedding
+RUN go install -ldflags="-X main.gitRef=${SOURCE_BRANCH} -X main.gitHash=${SOURCE_COMMIT}" -installsuffix cgo ./cmd/wedding
 
 ###############################################################
 FROM alpine:3.12.1
 RUN apk --no-cache add ca-certificates
 WORKDIR /root/
 COPY --from=build-env /go/bin/wedding .
-ENTRYPOINT [ "./wedding", "server" ]
+ENTRYPOINT [ "./wedding", "server" ]

deployment/config.yaml

@@ -4,7 +4,6 @@ metadata:
   name: buildkitd-config
 data:
   buildkitd.toml: |
-    debug = true
     
     [worker.oci]
       rootless = true 

deployment/kubernetes.yaml

@@ -27,7 +27,7 @@ spec:
       serviceAccountName: wedding
       containers:
         - name: wedding
-          image: wedding-image
+          image: davedamoon/wedding:latest
           args:
             - --s3-endpoint=minio:9000
             - --s3-access-key-file=/secret/minio/MINIO_ACCESS_KEY

pkg/build.go

@@ -315,8 +315,6 @@ mkdir ~/context && cd ~/context
 wget -O - "%s" | tar -xf -
 
 set -x
-export BUILDKITD_FLAGS="--oci-worker-no-process-sandbox"
-export BUILDCTL_CONNECT_RETRIES_MAX=100
 buildctl-daemonless.sh \
  build \
  --frontend dockerfile.v0 \