Revert commit that rolled back logger.Dockerfile, never build :latest…

… on GHA anymore (#556)
k8ssandra · Jul 27, 2023 · cf4cbc0 · cf4cbc0
1 parent 5ddb840
commit cf4cbc0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/.github/actions/run-integ-test/action.yml b/.github/actions/run-integ-test/action.yml
@@ -60,9 +60,6 @@ runs:
     - name: Load image on the nodes of the cluster
       shell: bash
       run: |
-        kind load docker-image --name=kind k8ssandra/cass-operator:latest
-        kind load docker-image --name=kind k8ssandra/system-logger:latest
-
         kind load docker-image --name=kind k8ssandra/cass-operator:v${{ steps.vars.outputs.version }}
         kind load docker-image --name=kind k8ssandra/system-logger:v${{ steps.vars.outputs.version }}
     - name: Run integration test ( ${{ inputs.integration_test }} )

diff --git a/.github/workflows/kindIntegTest.yml b/.github/workflows/kindIntegTest.yml
@@ -28,7 +28,7 @@ jobs:
           file: Dockerfile
           context: .
           push: false
-          tags: k8ssandra/cass-operator:latest, k8ssandra/cass-operator:v${{ steps.vars.outputs.version }}
+          tags: k8ssandra/cass-operator:v${{ steps.vars.outputs.version }}
           platforms: linux/amd64
           outputs: type=docker,dest=/tmp/k8ssandra-cass-operator.tar
           cache-from: type=local,src=/tmp/.buildx-cache
@@ -38,7 +38,7 @@ jobs:
         with:
           file: logger.Dockerfile
           push: false
-          tags: k8ssandra/system-logger:latest, k8ssandra/system-logger:v${{ steps.vars.outputs.version }}
+          tags: k8ssandra/system-logger:v${{ steps.vars.outputs.version }}
           outputs: type=docker,dest=/tmp/k8ssandra-system-logger.tar
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache

diff --git a/.github/workflows/operatorBuildAndDeploy.yml b/.github/workflows/operatorBuildAndDeploy.yml
@@ -77,7 +77,7 @@ jobs:
           file: Dockerfile
           context: .
           push: ${{ github.event_name != 'pull_request' }}
-          tags: k8ssandra/cass-operator:${{ steps.vars.outputs.sha_short }}, k8ssandra/cass-operator:latest, k8ssandra/cass-operator:v${{ steps.vars.outputs.version }}
+          tags: k8ssandra/cass-operator:${{ steps.vars.outputs.sha_short }}, k8ssandra/cass-operator:v${{ steps.vars.outputs.version }}
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
@@ -87,7 +87,7 @@ jobs:
         with:
           file: logger.Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
-          tags: k8ssandra/system-logger:${{ steps.vars.outputs.sha_short }}, k8ssandra/system-logger:latest, k8ssandra/system-logger:v${{ steps.vars.outputs.version }}
+          tags: k8ssandra/system-logger:${{ steps.vars.outputs.sha_short }}, k8ssandra/system-logger:v${{ steps.vars.outputs.version }}
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache

diff --git a/.github/workflows/workflow-integration-tests.yaml b/.github/workflows/workflow-integration-tests.yaml
@@ -30,7 +30,7 @@ jobs:
           file: Dockerfile
           context: .
           push: false
-          tags: k8ssandra/cass-operator:latest
+          tags: k8ssandra/cass-operator:v${{ steps.vars.outputs.version }}
           platforms: linux/amd64
           outputs: type=docker,dest=/tmp/k8ssandra-cass-operator.tar
           cache-from: type=local,src=/tmp/.buildx-cache
@@ -40,7 +40,7 @@ jobs:
         with:
           file: logger.Dockerfile
           push: false
-          tags: k8ssandra/system-logger:latest
+          tags: k8ssandra/system-logger:v${{ steps.vars.outputs.version }}
           outputs: type=docker,dest=/tmp/k8ssandra-system-logger.tar
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache

diff --git a/logger.Dockerfile b/logger.Dockerfile
@@ -3,15 +3,13 @@ ARG VERSION
 ARG TARGETPLATFORM
 
 # Install Vector
-ENV VECTOR_VERSION 0.29.1
+ENV VECTOR_VERSION 0.31.0
 RUN case ${TARGETPLATFORM} in \
          "linux/amd64")  VECTOR_ARCH=x86_64  ;; \
          "linux/arm64")  VECTOR_ARCH=aarch64  ;; \
     esac \
  && rpm -i https://packages.timber.io/vector/${VECTOR_VERSION}/vector-${VECTOR_VERSION}-1.${VECTOR_ARCH}.rpm
 
-RUN mkdir -p /var/lib/vector
-
 FROM redhat/ubi8-micro:latest
 
 ARG VERSION
@@ -29,11 +27,10 @@ LABEL description="Sidecar to output Cassandra system logs to stdout"
 COPY ./config/logger/vector_config.toml /etc/vector/vector.toml
 COPY --from=builder /usr/lib64/libstdc++.so.6 /usr/lib64/libstdc++.so.6
 COPY --from=builder /usr/bin/vector /usr/bin/vector
-COPY --from=builder --chown=999:999 /var/lib/vector /var/lib/vector
 
 ADD https://raw.githubusercontent.com/vectordotdev/vector/master/LICENSE /licences/LICENSE
 COPY ./LICENSE.txt /licenses/
 
 # Non-root user, cassandra as default
-USER cassandra:cassandra
+USER cassandra
 ENTRYPOINT ["/usr/bin/vector"]