diff --git a/Containerfile b/Containerfile index e202458..27b833c 100644 --- a/Containerfile +++ b/Containerfile @@ -1,29 +1,28 @@ -ARG DEBIAN_RELEASE=bullseye -ARG BASE_IMAGE=docker.io/bitnami/minideb:${DEBIAN_RELEASE} +ARG BASE_IMAGE=docker.io/alpine:latest FROM ${BASE_IMAGE} AS base -RUN apt-get update -RUN apt-get install -y \ - build-essential \ - libssl-dev \ - libgtk-3-dev \ - libappindicator3-0.1-cil-dev \ +RUN apk update +RUN apk add --no-cache \ + build-base \ + openssl3-dev \ + gtk+3.0-dev \ + libappindicator-dev \ patchelf \ - librsvg2-dev \ + librsvg-dev \ curl \ wget \ - pkg-config \ clang \ nodejs \ npm \ - libsoup2.4-dev \ - libwebkit2gtk-4.0-dev \ + libsoup-dev \ + webkit2gtk-dev \ file \ - python -RUN apt remove cmdtest -y + python3 \ + bash \ + protoc RUN curl https://sh.rustup.rs -sSf | bash -s -- -y ENV PATH="/root/.cargo/bin:${PATH}" -RUN rm -rf /var/lib/{apt,dpkg,cache,log}/ /var/cache +RUN rm -rf /var/lib/{cache,log}/ /var/cache FROM base AS sources WORKDIR /usr/src @@ -40,4 +39,4 @@ RUN python3 scripts/build.py daemon --verbose FROM sources AS build_ui WORKDIR /usr/src -RUN python3 scripts/build.py ui --verbose \ No newline at end of file +RUN python3 scripts/build.py ui --verbose --bundles deb diff --git a/scripts/build.py b/scripts/build.py index 6b4c71d..d7a3765 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -69,7 +69,10 @@ def build(component: str, bundles: List[str] = None): def build_daemon(): '''Builds daemon''' cargo('fetch', 'mediarepo-daemon') - cargo('build --release --frozen', 'mediarepo-daemon') + additional_flags = '' + if verbose: + additional_flags = '--verbose' + cargo('build --release --frozen ' + additional_flags, 'mediarepo-daemon') if windows: store_artifact('mediarepo-daemon/target/release/mediarepo-daemon.exe') @@ -81,10 +84,15 @@ def build_ui(bundles: List[str] = None): '''Builds UI''' yarn('install', 'mediarepo-ui') + additional_flags = '' + + if verbose: + additional_flags = '--verbose' + if bundles is not None: - cargo('tauri build --bundles ' + ' '.join(bundles), 'mediarepo-ui') + cargo('tauri build --bundles ' + ' '.join(bundles) + ' ' + additional_flags, 'mediarepo-ui') else: - cargo('tauri build ', 'mediarepo-ui') + cargo('tauri build ' + additional_flags, 'mediarepo-ui') if windows: store_artifact(