Skip to content

Commit

Permalink
Remove busybox reference from Dockerfiles (vmware-tanzu#524)
Browse files Browse the repository at this point in the history
Signed-off-by: Deepak Kinni <dkinni@vmware.com>
  • Loading branch information
Deepak Kinni authored and lipingxue committed May 19, 2023
1 parent 5531b1d commit 991e9f8
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 9 deletions.
5 changes: 0 additions & 5 deletions Dockerfile-datamgr
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM busybox:1.33.1 AS busybox

FROM photon:5.0
ADD /bin/linux/amd64/data-* /datamgr
COPY /bin/linux/amd64/lib/vmware-vix-disklib/lib64/* /vddkLibs/
COPY --from=busybox /bin/sh /bin/sh
COPY --from=busybox /bin/cp /bin/cp
COPY --from=busybox /bin/tar /bin/tar
COPY --from=busybox /bin/ls /bin/ls
ENTRYPOINT ["/datamgr"]
4 changes: 0 additions & 4 deletions Dockerfile-plugin
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM busybox:1.33.1 AS busybox

FROM photon:5.0
ADD /bin/linux/amd64/velero-* /plugins/
Expand All @@ -21,8 +20,5 @@ ADD /bin/linux/amd64/backup-driver* /
COPY /bin/linux/amd64/install.sh /scripts/
COPY /bin/linux/amd64/lib/vmware-vix-disklib/lib64/* /plugins/
ENV LD_LIBRARY_PATH=/plugins
COPY --from=busybox /bin/sh /bin/sh
COPY --from=busybox /bin/chmod /bin/chmod
COPY --from=busybox /bin/cp /bin/cp
RUN ["chmod", "+x", "/scripts/install.sh"]
ENTRYPOINT ["/bin/sh","/scripts/install.sh"]
1 change: 1 addition & 0 deletions changelogs/CHANGELOG-1.4.md
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ Date: 2022-03-16
- Process DeleteSnapshot CRs without explicit Phase set ([#441](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/441), [@deepakkinni](https://github.com/deepakkinni))
- Support creating snapshot for migrated CSI volume ([#443](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/443), [@liuy1vmware](https://github.com/liuy1vmware))
- Upgrade golang version to 1.17 ([#448](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/448), [@xinyanw409](https://github.com/xinyanw409))
- Remove busybox from Dockerfile ([#523](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/523), [@deepakkinni](https://github.com/deepakkinni))

## Dependencies

Expand Down
1 change: 1 addition & 0 deletions changelogs/CHANGELOG-1.5.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Date: 2022-2-22
CVE-2022-46908 ([#514](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/514), [@deepakkinni](https://github.com/deepakkinni))
- Update supervisor deployment doc to indicate that velero-vsphere-plugin-config needs to be created. ([#509](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/509), [@deepakkinni](https://github.com/deepakkinni))
- Fix datamgr Dockerfile ([#518](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/518), [@deepakkinni](https://github.com/deepakkinni))
- Remove busybox reference from Dockerfiles ([#524](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/524), [@deepakkinni](https://github.com/deepakkinni))

## Dependencies

Expand Down

0 comments on commit 991e9f8

Please sign in to comment.