Skip to content

Commit

Permalink
Merge pull request #3 from apalia/update
Browse files Browse the repository at this point in the history
Update Alpine base image
  • Loading branch information
olivierlemasle authored Jul 13, 2021
2 parents b81e96e + 3037a99 commit d41c5ba
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
lint:
name: Lint
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: golangci-lint
Expand All @@ -16,7 +16,7 @@ jobs:

build:
name: Test & Build
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Setup up Go 1.x
uses: actions/setup-go@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
jobs:
push:
name: Push images
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

steps:
- name: Check out code
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:

release:
name: Release
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

# Run only if previous job has succeeded
needs: [push]
Expand Down
11 changes: 9 additions & 2 deletions cmd/cloudstack-csi-driver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
FROM alpine:3.12.3
FROM alpine:3.14.0

LABEL \
org.opencontainers.image.description="CloudStack CSI driver" \
org.opencontainers.image.source="https://github.com/apalia/cloudstack-csi-driver/"

RUN apk add --no-cache xfsprogs e2fsprogs blkid ca-certificates
RUN apk add --no-cache \
ca-certificates \
# Provides mkfs.ext2, mkfs.ext3, mkfs.ext4 (used by k8s.io/mount-utils)
e2fsprogs \
# Provides mkfs.xfs
xfsprogs \
# Provides blkid, also used by k8s.io/mount-utils
blkid

COPY ./bin/cloudstack-csi-driver /cloudstack-csi-driver
ENTRYPOINT ["/cloudstack-csi-driver"]
2 changes: 1 addition & 1 deletion cmd/cloudstack-csi-sc-syncer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.12.3
FROM alpine:3.14.0

LABEL \
org.opencontainers.image.description="CloudStack disk offering to Kubernetes storage class syncer" \
Expand Down

0 comments on commit d41c5ba

Please sign in to comment.