Skip to content

Commit

Permalink
Cherry-pick #520, #524, #525 and #526 (#527)
Browse files Browse the repository at this point in the history
* Update 1.5 release notes (#520)
* Remove busybox reference from Dockerfiles (#524)
* Fix 1.4 changelog (#525)
* Update 1.5 Changelog (#526)

Signed-off-by: Deepak Kinni <[email protected]>
  • Loading branch information
Deepak Kinni authored Apr 26, 2023
1 parent f6f2b26 commit 0ce5fb4
Show file tree
Hide file tree
Showing 4 changed files with 17 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"]
8 changes: 8 additions & 0 deletions changelogs/CHANGELOG-1.4.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog since v1.3.0

## v1.4.3

Date: 2023-17-4

### Changes

- Remove busybox from Dockerfile ([#523](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/523), [@deepakkinni](https://github.com/deepakkinni))

## v1.4.2

Date: 2022-12-5
Expand Down
9 changes: 9 additions & 0 deletions changelogs/CHANGELOG-1.5.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog since v1.4.0

## v1.5.1

Date: 2022-4-27

### Changes

- Remove busybox reference from Dockerfiles ([#524](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/524), [@deepakkinni](https://github.com/deepakkinni))

## v1.5.0

Date: 2022-2-22
Expand All @@ -16,6 +24,7 @@ Date: 2022-2-22
CVE-2022-4304, CVE-2022-4450, CVE-2023-0215, CVE-2023-0216, CVE-2023-0217, CVE-2023-0401,
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))

## Dependencies

Expand Down

0 comments on commit 0ce5fb4

Please sign in to comment.