Merge pull request #29 from GoodNotes/fix-carton-build

Use carton jammy build and set carton toolchain

Author: AntonioCandinho

.github/workflows/docker.yml

@@ -48,8 +48,8 @@ jobs:
         build-args: |
           SWIFLINT_DOCKER_IMAGE=ghcr.io/realm/swiftlint:0.46.5
           CARTON_TAG=0.19.1
-          SWIFT_DOCKER_IMAGE=swift:5.8.0-focal
-          SWIFT_TAG=swift-wasm-5.8.0-RELEASE
+          SWIFT_DOCKER_IMAGE=swift:5.8.0-jammy
+          SWIFT_TAG=wasm-5.8.0-RELEASE
           SWIFT_FORMAT_TAG=508.0.1
           NODE_VERSION=16.x
           OPEN_JDK_VERSION=11

Dockerfile

@@ -4,11 +4,13 @@ ARG SWIFT_DOCKER_IMAGE
 FROM $SWIFLINT_DOCKER_IMAGE as swiftLint
 
 FROM $SWIFT_DOCKER_IMAGE as carton-builder
+ARG SWIFT_TAG
 ARG CARTON_TAG
 RUN apt-get update && apt-get install -y libsqlite3-dev
 RUN git clone https://github.com/swiftwasm/carton.git && \
     cd carton && \
     git checkout "tags/$CARTON_TAG" && \
+    export CARTON_DEFAULT_TOOLCHAIN=$SWIFT_TAG && \
     swift build -c release && \
     mv .build/release/carton /usr/bin
 
@@ -26,13 +28,13 @@ RUN git clone https://github.com/apple/swift-format.git && \
     sed -i -e 's/.upToNextMinor(from: "0.50700.0")/exact: "0.50700.0"/' Package.swift && \
     swift build -c release
 
-FROM ubuntu:20.04 as binaryen
+FROM ubuntu:22.04 as binaryen
 
 RUN apt-get update && apt-get install -y curl
 RUN curl -L -v -o binaryen.tar.gz https://github.com/WebAssembly/binaryen/releases/download/version_105/binaryen-version_105-x86_64-linux.tar.gz
 RUN tar xzvf binaryen.tar.gz
 
-FROM ubuntu:20.04 as symbolicator-builder
+FROM ubuntu:22.04 as symbolicator-builder
 
 ARG SYMBOLICATOR_VERSION
 RUN apt-get update && apt-get install -y curl
@@ -42,11 +44,11 @@ FROM $SWIFT_DOCKER_IMAGE-slim as swiftwasm-builder
 
 ARG SWIFT_TAG
 ARG NODE_VERSION
-ARG SWIFT_PLATFORM_SUFFIX=ubuntu20.04_x86_64.tar.gz
+ARG SWIFT_PLATFORM_SUFFIX=ubuntu22.04_x86_64.tar.gz
 ARG OPEN_JDK_VERSION
 ARG CYPRESS_VERSION
 
-ARG SWIFT_BIN_URL="https://github.com/swiftwasm/swift/releases/download/$SWIFT_TAG/$SWIFT_TAG-$SWIFT_PLATFORM_SUFFIX"
+ARG SWIFT_BIN_URL="https://github.com/swiftwasm/swift/releases/download/swift-$SWIFT_TAG/swift-$SWIFT_TAG-$SWIFT_PLATFORM_SUFFIX"
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     curl \
@@ -58,7 +60,7 @@ RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash -
 ENV CARTON_ROOT=/root/.carton
 
 # Download and Install swift toolchain (we need snapshot artifact for getting release Foundation library)
-RUN CARTON_DEFAULT_TOOLCHAIN_PATH="$CARTON_ROOT/sdk/${SWIFT_TAG#swift-}" \
+RUN CARTON_DEFAULT_TOOLCHAIN_PATH="$CARTON_ROOT/sdk/${SWIFT_TAG}" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz \
     && mkdir -p "$CARTON_DEFAULT_TOOLCHAIN_PATH" \
     && tar -xzf swift.tar.gz --directory "$CARTON_DEFAULT_TOOLCHAIN_PATH" --strip-components=1 \
@@ -90,6 +92,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     fonts-noto-color-emoji \
     fonts-indic \
     fonts-thai-tlwg-ttf \
+    unzip \
     && rm -rf /var/lib/apt/lists/*
 
 # Install yarn

README.md

@@ -23,8 +23,8 @@ The collection of tools included are:
 $ docker build \
     --build-arg SWIFLINT_DOCKER_IMAGE=ghcr.io/realm/swiftlint:0.46.5 \
     --build-arg CARTON_TAG=0.19.1 \
-    --build-arg SWIFT_DOCKER_IMAGE=swift:5.8.0-focal \
-    --build-arg SWIFT_TAG=swift-wasm-5.8.0-RELEASE \
+    --build-arg SWIFT_DOCKER_IMAGE=swift:5.8.0-jammy \
+    --build-arg SWIFT_TAG=wasm-5.8.0-RELEASE \
     --build-arg SWIFT_FORMAT_TAG=508.0.1 \
     --build-arg NODE_VERSION=16.x \
     --build-arg OPEN_JDK_VERSION=11 \
@@ -38,6 +38,24 @@ $ docker build \
 ## [TAGGED VERSIONS](https://github.com/GoodNotes/swiftwasm-frontend-docker/pkgs/container/swiftwasm-frontend-docker)
 Here you are a list of the tagged dockers with the specific tools version included.
 
+### 0.0.29:
+
+- Swift Web Assembly toolchain => `swift-wasm-5.8.0-RELEASE`
+- Carton => `0.19.1`
+- Binaryen => `105`
+- NodeJS => `v16.13.2`
+- Npm => `8.1.2`
+- Npx => `8.1.2`
+- Yarn => `1.22.17`
+- SwiftLint => `0.46.5`
+- SwiftFormat => `508.0.1`
+- Cypress => `12.3.0`
+- Brotli => `1.0.9`
+- Chrome => `101.0.4951.54`
+- ChromeDriver => `101.0.4951.41`
+- Firefox => `99.0.1`
+- Sentry Symbolicator => `0.5.0`
+
 ### 0.0.28:
 
 - Swift Web Assembly toolchain => `swift-wasm-5.8.0-RELEASE`