Merge branch 'main' into updatecli_updatecli-bump-golang

elastic · Dec 12, 2023 · e0e3866 · e0e3866
2 parents e9358f6 + 6d7aa14
commit e0e3866
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -46,7 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
           cache: true
@@ -46,7 +46,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
           cache: true
@@ -58,7 +58,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: systemtest/go.mod
           cache: true

diff --git a/.github/workflows/setup-cluster-env/action.yml b/.github/workflows/setup-cluster-env/action.yml
@@ -25,7 +25,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       with:
         go-version-file: go.mod
         cache-dependency-path: |

diff --git a/.github/workflows/update-beats.yml b/.github/workflows/update-beats.yml
@@ -26,7 +26,7 @@ jobs:
       matrix: ${{ fromJson(needs.filter.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
       - uses: elastic/apm-pipeline-library/.github/actions/updatecli@current

diff --git a/packaging/ironbank/Dockerfile b/packaging/ironbank/Dockerfile
@@ -44,6 +44,9 @@ COPY LICENSE /licenses/elastic-${ELASTIC_PRODUCT}
 # Add a dumb init process
 COPY tinit /tinit
 RUN chmod +x /tinit
+# Help with supporting the override in the ECK entrypoint
+# TODO: eventually /tinit will be replaced by /usr/bin/tini
+RUN ln -s /tinit /usr/bin/tini
 
 # Bring in product from the initial stage.
 COPY --from=prep_files --chown=1000:0 /usr/share/${ELASTIC_PRODUCT} /usr/share/${ELASTIC_PRODUCT}
@@ -68,6 +71,7 @@ RUN groupadd --gid 1000 ${ELASTIC_PRODUCT} && useradd --uid 1000 --gid 1000 --ho
 USER ${ELASTIC_PRODUCT}
 
 EXPOSE 8200
+# TODO: eventually /tinit will be replaced by /usr/bin/tini
 ENTRYPOINT ["/tinit", "--", "/usr/share/apm-server/apm-server"]
 CMD ["-environment", "container"]