Skip to content

Commit d41c5ba

Browse files
Merge pull request #3 from apalia/update
Update Alpine base image
2 parents b81e96e + 3037a99 commit d41c5ba

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

.github/workflows/pr-check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
lint:
88
name: Lint
9-
runs-on: ubuntu-18.04
9+
runs-on: ubuntu-20.04
1010
steps:
1111
- uses: actions/checkout@v2
1212
- name: golangci-lint
@@ -16,7 +16,7 @@ jobs:
1616

1717
build:
1818
name: Test & Build
19-
runs-on: ubuntu-18.04
19+
runs-on: ubuntu-20.04
2020
steps:
2121
- name: Setup up Go 1.x
2222
uses: actions/setup-go@v2

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
jobs:
1515
push:
1616
name: Push images
17-
runs-on: ubuntu-18.04
17+
runs-on: ubuntu-20.04
1818

1919
steps:
2020
- name: Check out code
@@ -67,7 +67,7 @@ jobs:
6767

6868
release:
6969
name: Release
70-
runs-on: ubuntu-18.04
70+
runs-on: ubuntu-20.04
7171

7272
# Run only if previous job has succeeded
7373
needs: [push]
Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1-
FROM alpine:3.12.3
1+
FROM alpine:3.14.0
22

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

7-
RUN apk add --no-cache xfsprogs e2fsprogs blkid ca-certificates
7+
RUN apk add --no-cache \
8+
ca-certificates \
9+
# Provides mkfs.ext2, mkfs.ext3, mkfs.ext4 (used by k8s.io/mount-utils)
10+
e2fsprogs \
11+
# Provides mkfs.xfs
12+
xfsprogs \
13+
# Provides blkid, also used by k8s.io/mount-utils
14+
blkid
815

916
COPY ./bin/cloudstack-csi-driver /cloudstack-csi-driver
1017
ENTRYPOINT ["/cloudstack-csi-driver"]

cmd/cloudstack-csi-sc-syncer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.12.3
1+
FROM alpine:3.14.0
22

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

0 commit comments

Comments
 (0)