Merge branch 'v3' into fix-transactions-order

percona · Dec 19, 2023 · cfa9ca1 · cfa9ca1
2 parents a04110b + 1a7c3e7
commit cfa9ca1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/managed.yml b/.github/workflows/managed.yml
@@ -88,7 +88,9 @@ jobs:
         run: docker exec -i pmm-server make -C managed test-cover
 
       - name: Run PMM server update test
-        run: docker exec -i pmm-server make -C managed test-update
+        run: |
+          echo "PMM Server update test will be refactored once we have a new update mechanism."
+          # docker exec -i pmm-server make -C managed test-update
 
       - name: Upload coverage results
         uses: codecov/codecov-action@v3

diff --git a/devcontainer.Dockerfile b/devcontainer.Dockerfile
@@ -4,6 +4,8 @@ FROM $PMM_SERVER_IMAGE
 ARG PMM_SERVER_IMAGE
 ARG GO_VERSION="1.21.x"
 
+USER root
+
 RUN echo "Building with: GO: $GO_VERSION, PMM: $PMM_SERVER_IMAGE"
 ENV GOPATH=/root/go
 ENV PATH="$PATH:$GOPATH/bin"