Skip to content

Commit 5866632

Browse files
committed
chore(wip): fix path
Signed-off-by: Yi Huang <yi@secondstate.io>
1 parent edc4b38 commit 5866632

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

Dockerfile.manylinux_2_28-plugins-deps

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM base AS deps-amd64
88
RUN cd && (yum check-update || true) && \
99
yum install -y wget unzip zlib-devel zlib-static elfutils-libelf-devel
1010

11-
COPY wasi-nn/install-pytorch.sh .
11+
COPY scripts/wasi-nn/install-pytorch.sh .
1212
ENV PYTORCH_VERSION="2.5.1"
1313
ENV PYTORCH_INSTALL_TO="/root"
1414
ENV Torch_DIR="/root/libtorch"
@@ -22,23 +22,23 @@ RUN cd && (yum check-update || true) && \
2222
### deps for all ###
2323
FROM deps-${TARGETARCH} AS final
2424

25-
COPY opencvmini/install-opencvmini.sh .
25+
COPY scripts/opencvmini/install-opencvmini.sh .
2626
ENV OPENCV_VERSION="4.8.0"
2727
RUN [ "/bin/bash", "install-opencvmini.sh" ]
2828

29-
COPY wasi-crypto/build-openssl.sh .
29+
COPY scripts/wasi-crypto/build-openssl.sh .
3030
ENV OpenSSL_DIR="/root/openssl-1.1.1n/openssl"
3131
RUN [ "/bin/bash", "build-openssl.sh" ]
3232

33-
COPY ffmpeg/install-ffmpeg-v6.0.sh .
33+
COPY scripts/ffmpeg/install-ffmpeg-v6.0.sh .
3434
RUN [ "/bin/bash", "install-ffmpeg-v6.0.sh" ]
3535
ENV PKG_CONFIG_PATH=/root/FFmpeg-n6.0/output/lib/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}
3636
ENV LD_LIBRARY_PATH=/root/FFmpeg-n6.0/output/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
3737

3838
ENV OPENVINO_VERSION="2025.0.0"
3939
ENV OPENVINO_YEAR="2025"
4040

41-
COPY wasi-nn/install-onnxruntime.sh .
41+
COPY scripts/wasi-nn/install-onnxruntime.sh .
4242
RUN [ "/bin/bash", "install-onnxruntime.sh" ]
4343

4444
RUN yum clean all

Dockerfile.ubuntu-plugins-deps

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ FROM base AS deps-20
3535

3636
WORKDIR /usr/local
3737

38-
COPY ffmpeg/install-ffmpeg-v6.0.sh .
38+
COPY scripts/ffmpeg/install-ffmpeg-v6.0.sh .
3939
RUN [ "/bin/bash", "install-ffmpeg-v6.0.sh" ]
4040
ENV PKG_CONFIG_PATH=/usr/local/FFmpeg-n6.0/output/lib/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}
4141
ENV LD_LIBRARY_PATH=/usr/local/FFmpeg-n6.0/output/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
@@ -47,20 +47,20 @@ FROM deps-${UBUNTU_VER} AS deps-all
4747

4848
WORKDIR /root
4949

50-
COPY opencvmini/install-opencvmini.sh .
50+
COPY scripts/opencvmini/install-opencvmini.sh .
5151
ENV OPENCV_VERSION="4.8.0"
5252
RUN [ "/bin/bash", "install-opencvmini.sh" ]
5353

54-
COPY wasi-nn/install-pytorch.sh .
54+
COPY scripts/wasi-nn/install-pytorch.sh .
5555
ENV PYTORCH_VERSION="2.5.1"
5656
ENV PYTORCH_INSTALL_TO="/usr/local"
5757
ENV Torch_DIR="/usr/local/libtorch"
5858
RUN [ "/bin/bash", "install-pytorch.sh" ]
5959

6060
ARG UBUNTU_VER
6161

62-
COPY wasi-nn/install-openvino.sh .
63-
COPY wasi-nn/install-openvino-genai.sh .
62+
COPY scripts/wasi-nn/install-openvino.sh .
63+
COPY scripts/wasi-nn/install-openvino-genai.sh .
6464
ENV OPENVINO_UBUNTU_VERSION=${UBUNTU_VER}
6565
ENV OPENVINO_VERSION="2025.0.0"
6666
ENV OPENVINO_YEAR="2025"
@@ -72,10 +72,10 @@ RUN [ "/bin/bash", "install-openvino-genai.sh" ]
7272
RUN [ "ls", "-al" ]
7373
RUN [ "/bin/bash", "-c", "echo \"source ./openvino_genai/setupvars.sh\" >> .bashrc" ]
7474

75-
COPY wasi-nn/install-onnxruntime.sh .
75+
COPY scripts/wasi-nn/install-onnxruntime.sh .
7676
RUN [ "/bin/bash", "install-onnxruntime.sh" ]
7777

78-
COPY wasi-nn/install-chattts.sh .
78+
COPY scripts/wasi-nn/install-chattts.sh .
7979
RUN [ "/bin/bash", "install-chattts.sh" ]
8080

8181
### cleanup

docker-bake.manylinux.hcl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
target "base" {
22
dockerfile = "Dockerfile.manylinux_2_28-base"
3-
context = "./utils/docker"
3+
context = "."
44
}
55

66
target "plugins-base" {
7-
dockerfile = "./docker/Dockerfile.manylinux_2_28-plugins-deps"
8-
context = "./utils"
7+
dockerfile = "Dockerfile.manylinux_2_28-plugins-deps"
8+
context = "."
99
}
1010

1111
target "x86_64" {

docker-bake.ubuntu.hcl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ function "tags" {
9595

9696
target "base" {
9797
dockerfile = "Dockerfile.ubuntu-base"
98-
context = "./utils/docker"
98+
context = "."
9999

100100
matrix = {
101101
ubuntu = ["20.04", "22.04", "24.04"]
@@ -109,8 +109,8 @@ target "base" {
109109
}
110110

111111
target "plugins" {
112-
dockerfile = "./docker/Dockerfile.ubuntu-plugins-deps"
113-
context = "./utils"
112+
dockerfile = "Dockerfile.ubuntu-plugins-deps"
113+
context = "."
114114

115115
matrix = {
116116
ubuntu = ["20.04", "22.04", "24.04"]
@@ -135,7 +135,7 @@ target "final" {
135135
}
136136

137137
dockerfile = "Dockerfile.ubuntu-env"
138-
context = "./utils/docker"
138+
context = "."
139139

140140
name = "${parent}-${no-dot(ubuntu)}-${toolchain}"
141141
contexts = {
@@ -150,7 +150,7 @@ target "final" {
150150

151151
target "cuda" {
152152
dockerfile = "Dockerfile.ubuntu-cuda"
153-
context = "./utils/docker"
153+
context = "."
154154

155155
matrix = {
156156
cuda = ["11.3", "12.0"]

0 commit comments

Comments
 (0)