#311: fix file names at dockerfile (#312)

* fix file names at dockerfile * remove make all command on devcontainer * update dockerfile --------- Co-authored-by: Pedro Tashima <[email protected]>
rancher · Nov 27, 2023 · ca05419 · ca05419
1 parent 91ce1d9
commit ca05419
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -7,7 +7,6 @@
     // List of ports that you want to preview
     // "forwardPorts": [1234, 5678],
     // Script to run to bootstrap the app when the space is created
-    "postCreateCommand": "make all",
     "extensions": [
         "github.vscode-pull-request-github",
         "ms-azuretools.vscode-docker",

diff --git a/Dockerfile b/Dockerfile
@@ -16,10 +16,7 @@ RUN apk --no-cache add \
     yq
 COPY . /ecm-distro-tools
 WORKDIR /ecm-distro-tools
-RUN cd ./cmd/backport && make LDFLAGS="-linkmode=external"
-RUN cd ./cmd/gen_release_notes && make LDFLAGS="-linkmode=external"
-RUN cd ./cmd/gen_release_report && make LDFLAGS="-linkmode=external"
-RUN cd ./cmd/k3s_release && make LDFLAGS="-linkmode=external"
+RUN make all
 ARG ETCD_VERSION=v3.5.7
 ARG GH_VERSION=2.23.0
 ARG YQ_VERSION=v4.30.8
@@ -53,11 +50,15 @@ RUN zypper update -y && \
         awk             \
         net-tools    && \
     zypper clean --all
-COPY --from=builder /ecm-distro-tools/cmd/gen_release_notes/bin/gen_release_notes /usr/local/bin
-COPY --from=builder /ecm-distro-tools/cmd/gen_release_report/bin/gen_release_report /usr/local/bin
-COPY --from=builder /ecm-distro-tools/cmd/k3s_release/bin/k3s_release /usr/local/bin
-COPY --from=builder /ecm-distro-tools/cmd/backport/bin/backport /usr/local/bin
-COPY --from=builder /ecm-distro-tools/cmd/test_coverage/bin/test_coverage /usr/local/bin
+COPY --from=builder /ecm-distro-tools/cmd/backport/bin/backport-linux-amd64 /usr/local/bin/backport
+COPY --from=builder /ecm-distro-tools/cmd/gen_release_notes/bin/gen_release_notes-linux-amd64 /usr/local/bin/gen_release_notes
+COPY --from=builder /ecm-distro-tools/cmd/gen_release_report/bin/gen_release_report-linux-amd64 /usr/local/bin/gen_release_report
+COPY --from=builder /ecm-distro-tools/cmd/k3s_release/bin/k3s_release-linux-amd64 /usr/local/bin/k3s_release
+COPY --from=builder /ecm-distro-tools/cmd/rancher_release/bin/rancher_release-linux-amd64 /usr/local/bin/rancher_release
+COPY --from=builder /ecm-distro-tools/cmd/rke2_release/bin/rke2_release-linux-amd64 /usr/local/bin/rke2_release
+COPY --from=builder /ecm-distro-tools/cmd/semv/bin/semv-linux-amd64 /usr/local/bin/semv
+COPY --from=builder /ecm-distro-tools/cmd/test_coverage/bin/test_coverage-linux-amd64 /usr/local/bin/test_coverage
+COPY --from=builder /ecm-distro-tools/cmd/upstream_go_version/bin/upstream_go_version-linux-amd64 /usr/local/bin/upstream_go_version
 COPY --from=builder /usr/local/bin/etcdctl /usr/local/bin
 COPY --from=builder /usr/local/bin/trivy /usr/local/bin
 COPY --from=builder /usr/local/bin/gh /usr/local/bin