Skip to content

Commit 1b5fd70

Browse files
dockerfile changes
1 parent 3a834df commit 1b5fd70

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin
2727

2828
- name: Build Image
29-
run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make image
29+
run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make image
3030

3131
- name: Push Image
32-
run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all
32+
run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make docker-push-all

Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,11 @@ RUN yum install -y util-linux \
3737
&& yum install -y xfsprogs \
3838
&& yum clean all
3939

40+
COPY scripts/encrypt-mount /sbin/encrypt-mount
41+
COPY scripts/encrypt-umount /sbin/encrypt-umount
42+
COPY scripts/rpm-host /sbin/rpm-host
43+
RUN chmod 755 /sbin/encrypt-mount
44+
RUN chmod 755 /sbin/encrypt-umount
45+
RUN chmod 755 /sbin/rpm-host
46+
4047
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/

Dockerfile_arm_all

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,11 @@ RUN yum install -y util-linux \
2121
&& yum clean all
2222
\
2323

24+
COPY scripts/encrypt-mount /sbin/encrypt-mount
25+
COPY scripts/encrypt-umount /sbin/encrypt-umount
26+
COPY scripts/rpm-host /sbin/rpm-host
27+
RUN chmod 755 /sbin/encrypt-mount
28+
RUN chmod 755 /sbin/encrypt-umount
29+
RUN chmod 755 /sbin/rpm-host
30+
2431
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/arm/* /usr/local/bin/

0 commit comments

Comments
 (0)