Update Golang Dockerfile (#118)

Author: rberrelleza

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   build:
@@ -14,25 +14,25 @@ jobs:
         working-directory: .
 
     steps:
-    - name: Check out code
-      uses: actions/checkout@v3
-
-    - name: Set up Docker Context for Buildx
-      id: buildx-context
-      run: |
-        docker context create builders
-
-    - name: Set up Docker Builder
-      uses: docker/setup-buildx-action@v2
-      with:
-        version: latest
-        install: true
-        endpoint: builders
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-      with:
-        platforms: arm64,amd64
-
-    - name: "Build"
-      run: make build
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Context for Buildx
+        id: buildx-context
+        run: |
+          docker context create builders
+
+      - name: Set up Docker Builder
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: latest
+          install: true
+          endpoint: builders
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64,amd64
+
+      - name: "Build"
+        run: make build

.github/workflows/push.yml

@@ -15,31 +15,31 @@ jobs:
         working-directory: .
 
     steps:
-    - name: Check out code
-      uses: actions/checkout@v3
-
-    - name: Set up Docker Context for Buildx
-      id: buildx-context
-      run: |
-        docker context create builders
-
-    - name: Set up Docker Builder
-      uses: docker/setup-buildx-action@v2
-      with:
-        version: latest
-        install: true
-        endpoint: builders
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-      with:
-        platforms: arm64,amd64
-
-    - name: Login to DockerHub
-      uses: docker/login-action@v2
-      with:
-        username: "${{ secrets.DOCKER_USER }}"
-        password: "${{ secrets.DOCKER_PASS }}"
-
-    - name: "Push"
-      run: make push
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Context for Buildx
+        id: buildx-context
+        run: |
+          docker context create builders
+
+      - name: Set up Docker Builder
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: latest
+          install: true
+          endpoint: builders
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64,amd64
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: "${{ secrets.DOCKER_USER }}"
+          password: "${{ secrets.DOCKER_PASS }}"
+
+      - name: "Push"
+        run: make push

docker-compose.golang.yml

@@ -1,4 +1,4 @@
-version: '3.7'
+version: "3.7"
 
 services:
   golang1:
@@ -24,6 +24,10 @@ services:
       dockerfile: golang/Dockerfile
       args:
         VERSION: "1.22"
+        # Need to override this because newever versions of gopls doesn't work with this golang version
+        GOPLS_VERSION: "v0.16.1"
+        # Need to override this because newever versions of AIR doesn't work with this golang version
+        AIR_VERSION: "v1.52.3"
 
   golang1.21:
     image: okteto/golang:1.21
@@ -34,14 +38,7 @@ services:
         VERSION: "1.21"
         # Need to override this because default value doesn't work with this golang version
         CONTROLLER_GEN_VERSION: "v0.14.0"
-
-  golang1.20:
-    image: okteto/golang:1.20
-    build:
-      context: .
-      dockerfile: golang/Dockerfile
-      args:
-        VERSION: "1.20"
-        DEBIAN_VERSION: "buster"
-        # Need to override this because default value doesn't work with this golang version
-        CONTROLLER_GEN_VERSION: "v0.14.0"
+        # Need to override this because newever versions of AIR doesn't work with this golang version
+        AIR_VERSION: "v1.49.0"
+        # Need to override this because newever versions of gopls doesn't work with this golang version
+        GOPLS_VERSION: "v0.16.1"

golang/Dockerfile

@@ -3,16 +3,19 @@ ARG DEBIAN_VERSION="bookworm"
 FROM golang:${VERSION}-${DEBIAN_VERSION}
 
 ARG CONTROLLER_GEN_VERSION="v0.16.5"
+ARG DLV_VERSION="latest"
+ARG AIR_VERSION="v1.61.5"
+ARG GOPLS_VERSION="latest"
 
 WORKDIR /usr/src/app
 
 # setup okteto message
 COPY bashrc /root/.bashrc
 
 RUN go install github.com/codegangsta/gin@latest && \
-    go install github.com/go-delve/delve/cmd/dlv@latest && \
-    go install golang.org/x/tools/gopls@latest && \
-    go install sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERSION}
-RUN curl -sSfL https://raw.githubusercontent.com/air-verse/air/master/install.sh | sh -s -- -b /usr/bin
+    go install github.com/go-delve/delve/cmd/dlv@${DLV_VERSION} && \
+    go install golang.org/x/tools/gopls@${GOPLS_VERSION} && \
+    go install sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERSION} && \
+    curl -sSfL https://raw.githubusercontent.com/air-verse/air/master/install.sh | sh -s -- -b /usr/bin -d ${AIR_VERSION}
 
 CMD ["bash"]