Skip to content

Commit 1d098fc

Browse files
committed
Remove deislabs references from dockerfile and scripts
Allowed dep_build_wasm_examples to be run on demand so we can force update of sample builder image Signed-off-by: Simon Davies <simongdavies@users.noreply.github.com>
1 parent 518b702 commit 1d098fc

4 files changed

Lines changed: 18 additions & 11 deletions

File tree

.github/workflows/dep_build_wasm_examples.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@
44
name: Build Wasm Examples
55

66
on:
7+
workflow_dispatch:
8+
inputs:
9+
docs_only:
10+
description: Skip building if docs only
11+
required: false
12+
type: string
13+
default: "false"
714
workflow_call:
815
inputs:
9-
docs_only:
10-
description: Skip building if docs only
11-
required: false
12-
type: string
13-
default: "false"
16+
docs_only:
17+
description: Skip building if docs only
18+
required: false
19+
type: string
20+
default: "false"
1421

1522
permissions:
1623
packages: write

src/hyperlight_wasm/scripts/build-wasm-examples.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ else
2929
echo This will take a while if it is the first time you are building the docker image.
3030
echo Log in ${OUTPUT_DIR}/dockerbuild.log
3131

32-
docker pull ghcr.io/deislabs/wasm-clang-builder:latest
32+
docker pull ghcr.io/hyperlight-dev/wasm-clang-builder:latest
3333

34-
docker build --build-arg GCC_VERSION=12 --build-arg WASI_SDK_VERSION_FULL=20.0 --cache-from ghcr.io/deislabs/wasm-clang-builder:latest -t wasm-clang-builder:latest . 2> ${OUTPUT_DIR}/dockerbuild.log
34+
docker build --build-arg GCC_VERSION=12 --build-arg WASI_SDK_VERSION_FULL=20.0 --cache-from ghcr.io/hyperlight-dev/wasm-clang-builder:latest -t wasm-clang-builder:latest . 2> ${OUTPUT_DIR}/dockerbuild.log
3535

3636
for FILENAME in $(find . -name '*.c')
3737
do

src/wasmsamples/compile-wasm.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ where docker || (
1414
set "dockeroutput=$(wslpath '%~2')"
1515
)
1616

17-
%dockercmd% pull ghcr.io/deislabs/wasm-clang-builder:latest
17+
%dockercmd% pull ghcr.io/hyperlight-dev/wasm-clang-builder:latest
1818

1919
echo Building docker image that has Wasm sdk. Should be quick if no changes to docker image.
2020
echo Log in %2\dockerbuild.log
21-
%dockercmd% build --build-arg GCC_VERSION=12 --build-arg WASI_SDK_VERSION_FULL=20.0 --cache-from ghcr.io/deislabs/wasm-clang-builder:latest -t wasm-clang-builder:latest !dockerinput! 2> %2dockerbuild.log
21+
%dockercmd% build --build-arg GCC_VERSION=12 --build-arg WASI_SDK_VERSION_FULL=20.0 --cache-from ghcr.io/hyperlight-dev/wasm-clang-builder:latest -t wasm-clang-builder:latest !dockerinput! 2> %2dockerbuild.log
2222

2323
echo Building Wasm files in %1 and output to %2
2424
for /R "%1" %%i in (*.c) do (

src/wasmsamples/dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu
22
ENV DEBIAN_FRONTEND=noninteractive
3-
LABEL org.opencontainers.image.source=https://github.com/deislabs/hyperlight-wasm
3+
LABEL org.opencontainers.image.source=https://github.com/hyperlight-dev/hyperlight-wasm
44

55
ARG GCC_VERSION=12
66

@@ -19,4 +19,4 @@ RUN wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WA
1919
&& tar xvf wasi-sdk-${WASI_SDK_VERSION_FULL}-linux.tar.gz \
2020
&& rm wasi-sdk-${WASI_SDK_VERSION_FULL}-linux.tar.gz \
2121
&& mv /wasi-sdk-${WASI_SDK_VERSION_FULL} /opt/wasi-sdk
22-
CMD ["/bin/sh"]
22+
CMD ["/bin/sh"]

0 commit comments

Comments
 (0)