diff --git a/.drone.yml b/.drone.yml index c3a1c07a19a..5387fe51fb9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,7 @@ platform: steps: - name: identify-runner - image: alpine:3.14.1 + image: alpine:3.14.2 commands: - echo $DRONE_RUNNER_NAME @@ -17,7 +17,7 @@ steps: image: grafana/build-container:1.4.2 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz @@ -246,7 +246,7 @@ platform: steps: - name: identify-runner - image: alpine:3.14.1 + image: alpine:3.14.2 commands: - echo $DRONE_RUNNER_NAME @@ -254,7 +254,7 @@ steps: image: grafana/build-container:1.4.2 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz @@ -595,7 +595,7 @@ steps: image: grafana/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/windows/grabpl.exe -OutFile grabpl.exe - name: build-windows-installer image: grafana/ci-wix:0.1.1 @@ -636,7 +636,7 @@ platform: steps: - name: identify-runner - image: alpine:3.14.1 + image: alpine:3.14.2 commands: - echo $DRONE_RUNNER_NAME @@ -644,7 +644,7 @@ steps: image: grafana/build-container:1.4.2 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone environment: @@ -724,7 +724,7 @@ platform: steps: - name: identify-runner - image: alpine:3.14.1 + image: alpine:3.14.2 commands: - echo $DRONE_RUNNER_NAME @@ -732,7 +732,7 @@ steps: image: grafana/build-container:1.4.2 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - ./bin/grabpl verify-version ${DRONE_TAG} @@ -1034,7 +1034,7 @@ steps: image: grafana/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/windows/grabpl.exe -OutFile grabpl.exe - name: build-windows-installer image: grafana/ci-wix:0.1.1 @@ -1076,7 +1076,7 @@ clone: steps: - name: identify-runner - image: alpine:3.14.1 + image: alpine:3.14.2 commands: - echo $DRONE_RUNNER_NAME @@ -1084,7 +1084,7 @@ steps: image: grafana/build-container:1.4.2 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/grabpl - chmod +x bin/grabpl - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -1502,7 +1502,7 @@ steps: image: grafana/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/windows/grabpl.exe -OutFile grabpl.exe - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise - git checkout ${DRONE_TAG} @@ -1562,7 +1562,7 @@ platform: steps: - name: identify-runner - image: alpine:3.14.1 + image: alpine:3.14.2 commands: - echo $DRONE_RUNNER_NAME @@ -1570,7 +1570,7 @@ steps: image: grafana/build-container:1.4.2 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - ./bin/grabpl verify-version ${DRONE_TAG} @@ -1670,7 +1670,7 @@ platform: steps: - name: identify-runner - image: alpine:3.14.1 + image: alpine:3.14.2 commands: - echo $DRONE_RUNNER_NAME @@ -1678,7 +1678,7 @@ steps: image: grafana/build-container:1.4.2 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - ./bin/grabpl verify-version v7.3.0-test @@ -1969,7 +1969,7 @@ steps: image: grafana/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/windows/grabpl.exe -OutFile grabpl.exe - name: build-windows-installer image: grafana/ci-wix:0.1.1 @@ -2011,7 +2011,7 @@ clone: steps: - name: identify-runner - image: alpine:3.14.1 + image: alpine:3.14.2 commands: - echo $DRONE_RUNNER_NAME @@ -2019,7 +2019,7 @@ steps: image: grafana/build-container:1.4.2 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/grabpl - chmod +x bin/grabpl - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -2431,7 +2431,7 @@ steps: image: grafana/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/windows/grabpl.exe -OutFile grabpl.exe - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise - git checkout main @@ -2491,7 +2491,7 @@ platform: steps: - name: identify-runner - image: alpine:3.14.1 + image: alpine:3.14.2 commands: - echo $DRONE_RUNNER_NAME @@ -2499,7 +2499,7 @@ steps: image: grafana/build-container:1.4.2 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - ./bin/grabpl verify-version v7.3.0-test @@ -2599,7 +2599,7 @@ platform: steps: - name: identify-runner - image: alpine:3.14.1 + image: alpine:3.14.2 commands: - echo $DRONE_RUNNER_NAME @@ -2607,7 +2607,7 @@ steps: image: grafana/build-container:1.4.2 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz @@ -2873,7 +2873,7 @@ steps: image: grafana/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/windows/grabpl.exe -OutFile grabpl.exe - name: build-windows-installer image: grafana/ci-wix:0.1.1 @@ -2911,7 +2911,7 @@ clone: steps: - name: identify-runner - image: alpine:3.14.1 + image: alpine:3.14.2 commands: - echo $DRONE_RUNNER_NAME @@ -2919,7 +2919,7 @@ steps: image: grafana/build-container:1.4.2 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/grabpl - chmod +x bin/grabpl - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -3334,7 +3334,7 @@ steps: image: grafana/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.0/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.4.1/windows/grabpl.exe -OutFile grabpl.exe - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise - git checkout $$env:DRONE_BRANCH @@ -3478,6 +3478,6 @@ get: --- kind: signature -hmac: cfc441d59a1881945c75cf7aca381871d9213a992c60bf260cc86ea0b803176b +hmac: fc7b2043fb06406ff38c3981f0511020f6b569f0296dc0a000108d9b58427592 ... diff --git a/Dockerfile b/Dockerfile index e10137f12f4..36640796a1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,7 +51,7 @@ ENV PATH="/usr/share/grafana/bin:$PATH" \ WORKDIR $GF_PATHS_HOME RUN apk add --no-cache ca-certificates bash tzdata && \ - apk add --no-cache openssl musl-utils libcrypto1.1>1.1.1l-r0 libssl1.1>1.1.1l-r0 + apk add --no-cache openssl musl-utils COPY conf ./conf diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile index 85d77918b2c..79aefec081e 100644 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14.1 +FROM alpine:3.14.2 USER root diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index a73cf4f67cd..179aa7df6c2 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.14.1 +ARG BASE_IMAGE=alpine:3.14.2 FROM ${BASE_IMAGE} ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz" @@ -27,7 +27,7 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi WORKDIR $GF_PATHS_HOME RUN apk add --no-cache ca-certificates bash tzdata && \ - apk add --no-cache openssl musl-utils libcrypto1.1>1.1.1l-r0 libssl1.1>1.1.1l-r0 + apk add --no-cache openssl musl-utils # Oracle Support for x86_64 only RUN if [ `arch` = "x86_64" ]; then \ diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh index 8175ff80cc1..a14a20329f3 100755 --- a/packaging/docker/build.sh +++ b/packaging/docker/build.sh @@ -60,7 +60,7 @@ docker_build () { if [ $UBUNTU_BASE = "0" ]; then libc="-musl" dockerfile="Dockerfile" - base_image="${base_arch}alpine:3.14.1" + base_image="${base_arch}alpine:3.14.2" else libc="" dockerfile="ubuntu.Dockerfile" diff --git a/scripts/lib.star b/scripts/lib.star index 72be4ef808c..5592d3c4b27 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -1,11 +1,11 @@ load('scripts/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token') -grabpl_version = '2.4.0' +grabpl_version = '2.4.1' build_image = 'grafana/build-container:1.4.2' publish_image = 'grafana/grafana-ci-deploy:1.3.1' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image' -alpine_image = 'alpine:3.14.1' +alpine_image = 'alpine:3.14.2' windows_image = 'mcr.microsoft.com/windows:1809' dockerize_version = '0.6.1' wix_image = 'grafana/ci-wix:0.1.1'