Skip to content

Commit

Permalink
Changing nginx from alpine to ubuntu bionic (#4549)
Browse files Browse the repository at this point in the history
Changing nginx from alpine to ubuntu bionic.

What motivated the change is this issue on alpine: https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.13.0#time64_requirements 
Our Tier 1 support Raspbian Stretch is impacted by the issue.

Reverting to previous Alpine is not an option because of security concern. Setting the image temporarily to Ubuntu Bionic Beaver(18.04).
The impact is an increase of image size from 18Mb to 108Mb.

TEST:
Deployed al level5 on raspberryPI stretch
Before:
Sun Jan  0 00:100:4174038  1900
After:
Fri Mar  5 04:32:13 UTC 2021

Note: Strangely I didn't see any crash. Only the date was wrong.
  • Loading branch information
huguesBouvier authored Mar 6, 2021
1 parent fea7066 commit 89ad3da
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------

FROM arm32v7/nginx:1.19.7-alpine
FROM arm32v7/nginx:1.19.7
WORKDIR /app
COPY ./docker/linux/arm32v7/api-proxy-module .
COPY ./docker/linux/arm32v7/templates .
Expand Down
6 changes: 3 additions & 3 deletions scripts/linux/buildAPIProxy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ process_args()

case ${ARCH} in
amd64) TARGET="x86_64-unknown-linux-musl";;
arm32v7) TARGET="armv7-unknown-linux-musleabihf";;
arm32v7) TARGET="armv7-unknown-linux-gnueabihf";;
arm64v8) TARGET="aarch64-unknown-linux-gnu";;
esac

Expand Down Expand Up @@ -153,9 +153,9 @@ build_project()
if [[ "$ARCH" == "amd64" ]]; then
execute scripts/linux/cross-platform-rust-build.sh --os alpine --arch "amd64" --build-path edge-modules/api-proxy-module
elif [[ "$ARCH" == "arm32v7" ]]; then
execute scripts/linux/cross-platform-rust-build.sh --os alpine --arch "arm32v7" --build-path edge-modules/api-proxy-module
execute scripts/linux/cross-platform-rust-build.sh --os ubuntu18.04 --arch "arm32v7" --build-path edge-modules/api-proxy-module
elif [[ "$ARCH" == "arm64v8" ]]; then
execute scripts/linux/cross-platform-rust-build.sh --os alpine --arch "aarch64" --build-path edge-modules/api-proxy-module
execute scripts/linux/cross-platform-rust-build.sh --os ubuntu18.04 --arch "aarch64" --build-path edge-modules/api-proxy-module
else
echo "Cannot run script Unsupported architecture $ARCH"
exit 1
Expand Down

0 comments on commit 89ad3da

Please sign in to comment.