Skip to content

Fix broken build script #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deeTEEcee wants to merge 1 commit into
base: 1.0+sm
Choose a base branch
from
Open

Fix broken build script #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions edge-modules/api-proxy-module/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docker/linux/**/build
14 changes: 7 additions & 7 deletions edge-modules/api-proxy-module/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,24 +88,24 @@ echo ${PROJECT_ROOT}

if [[ "$ARCH" == "amd64" ]]; then
set +e
docker run --rm -it -v "${PROJECT_ROOT}":/home/rust/src ekidd/rust-musl-builder cargo build --release --manifest-path /home/rust/src/edge-modules/api-proxy-module/Cargo.toml
docker run --rm -it -v "${PROJECT_ROOT}":/home/rust/src ekidd/rust-musl-builder /bin/bash -c "sudo chown -R rust:rust /opt/rust;rustup target add x86_64-unknown-linux-musl;cargo build --release --manifest-path /home/rust/src/edge-modules/api-proxy-module/Cargo.toml"
set -e

cp -r ./templates/ ./docker/linux/amd64
cp -r ./target/x86_64-unknown-linux-musl/release/api-proxy-module ./docker/linux/amd64
cp -r ./templates/ ./docker/linux/amd64/build
cp ./target/x86_64-unknown-linux-musl/release/api-proxy-module ./docker/linux/amd64/build
docker build . -t azureiotedge-api-proxy -f docker/linux/amd64/Dockerfile
elif [[ "$ARCH" == "arm32v7" ]]; then

docker run --rm -it -v "${PROJECT_ROOT}":/home/rust/src messense/rust-musl-cross:armv7-musleabihf /bin/bash -c " rm -frv ~/.rustup/toolchains/* &&curl -sSLf https://sh.rustup.rs | sh -s -- -y && rustup target add armv7-unknown-linux-musleabihf && cargo build --target=armv7-unknown-linux-musleabihf --release --manifest-path /home/rust/src/edge-modules/api-proxy-module/Cargo.toml"
cp -r ./templates/ ./docker/linux/arm32v7
cp -r ./target/armv7-unknown-linux-musleabihf/release/api-proxy-module ./docker/linux/arm32v7
cp -r ./templates/ ./docker/linux/arm32v7/build
cp ./target/armv7-unknown-linux-musleabihf/release/api-proxy-module ./docker/linux/arm32v7/build
docker build . -t azureiotedge-api-proxy -f docker/linux/arm32v7/Dockerfile
elif [[ "$ARCH" == "aarch64" ]]; then
set +e
../../scripts/linux/cross-platform-rust-build.sh --os alpine --arch $ARCH --build-path edge-modules/api-proxy-module
set -e

cp -r ./templates/ ./docker/linux/arm64v8
cp -r ./target/aarch64-unknown-linux-gnu/release/api-proxy-module ./docker/linux/arm64v8
cp -r ./templates/ ./docker/linux/arm64v8/build
cp ./target/aarch64-unknown-linux-gnu/release/api-proxy-module ./docker/linux/arm64v8/build
docker build . -t azureiotedge-api-proxy -f docker/linux/arm64v8/Dockerfile
fi
3 changes: 1 addition & 2 deletions edge-modules/api-proxy-module/docker/linux/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ RUN adduser -Ds /bin/sh -u ${NGINXUSER_ID} nginx

RUN chown -R nginx:nginx /app

COPY ./docker/linux/amd64/api-proxy-module .
COPY ./docker/linux/amd64/templates .
COPY ./docker/linux/amd64/build .

RUN apk update && \
apk add --no-cache nginx && \
Expand Down
3 changes: 1 addition & 2 deletions edge-modules/api-proxy-module/docker/linux/arm32v7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ RUN chown -R nginx:nginx /app && \
RUN touch /var/run/nginx.pid && \
chown -R nginx:nginx /var/run/nginx.pid

COPY ./docker/linux/arm32v7/api-proxy-module .
COPY ./docker/linux/arm32v7/templates .
COPY ./docker/linux/arm32v7/build .

USER nginx

Expand Down
4 changes: 2 additions & 2 deletions edge-modules/api-proxy-module/docker/linux/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ RUN chown -R nginx:nginx /app && \
RUN touch /var/run/nginx.pid && \
chown -R nginx:nginx /var/run/nginx.pid

COPY ./docker/linux/arm64v8/api-proxy-module .
COPY ./docker/linux/arm64v8/templates .
COPY ./docker/linux/arm64v8/build/api-proxy-module .
COPY ./docker/linux/arm64v8/build/templates .

USER nginx

Expand Down