Merge branch 'tool_synapse-compress-state'

README.md

@@ -18,7 +18,7 @@ Collection of Dockerfiles created to build & pack various tools.
 
 # 1. How to use
 
-Run the build-script `script/build.sh` with the path to the tool you want to build.
+Run the build-script `scripts/build.sh` with the path to the tool you want to build.
 
 <br>
 
@@ -30,11 +30,16 @@ You can add more tags or change the existing tag-naming-scheme using the environ
 
 ## 1.1. CLI
 
-`script/build.sh <toolPath> [extra-args for docker build ..]`
+`scripts/build.sh <toolPath> [extra-args for docker build ..]`
 
 <br>
 
-### 1.1.1. Environment-Variables
+### 1.1.1. Example
+`scripts/build.sh tools/bandwhich/`
+
+<br>
+
+### 1.1.2. Environment-Variables
 
 Variable    | Description                       | Default
 -|-|-
@@ -96,5 +101,5 @@ https://github.com/matrix-org/rust-synapse-compress-state
 
 ### 2.3.2. Example
 ```
-docker run --net container:synapse synapse-compress-state synapse_auto_compressor -p postgresql://synapse:synapse@127.0.0.1/synapse -c 500 -n 100
+docker run --net container:synapse ghcr.io/ruakij/dockerbuilds/synapse-compress-state:latest synapse_auto_compressor -p postgresql://synapse:synapse@127.0.0.1/synapse -c 500 -n 100
 ```

scripts/build.sh

@@ -14,7 +14,6 @@ ORIGINALDIR=$PWD
 # Get args without path
 EXTRA_ARGS="${@:2}"
 
-TAG=${TAG:-"${TAG_PREFIX}${NAME}"}
 
 
 # Call prepare

scripts/utils/prepare.sh

@@ -51,5 +51,5 @@ fi
 export VERSION
 printf "Version: ${VERSION}\n"
 
-TAG=${TAG:-"${TAG_PREFIX}${NAME}"}
+TAG=${TAG:-"${TAGPREFIX}${NAME}"}
 printf "> ${TAG}\n"

tools/synapse-compress-state/Dockerfile

@@ -13,14 +13,20 @@ RUN apk add python3 musl-dev pkgconfig openssl-dev make
 ENV RUSTFLAGS="-C target-feature=-crt-static"
 # Copy sources
 ADD .build/repository/ .
+
+FROM build AS build-synapse_compress-state
 # Update dependencies and Compile
 RUN cargo update && cargo build --release
 
+FROM build AS build-synapse_auto_compressor
+# Update dependencies and Compile
+RUN cd synapse_auto_compressor/ && cargo update && cargo build --release
+
 
 # ---- Release ----
 FROM base AS release
-# Copy build-target
-COPY --from=build /build/target/release/synapse_compress_state .
-COPY --from=build /build/target/release/synapse_auto_compressor .
+## Copy build-target
+COPY --from=build-synapse_compress-state /build/target/release/synapse_compress_state .
+COPY --from=build-synapse_auto_compressor /build/target/release/synapse_auto_compressor .
 
 ENTRYPOINT ["./synapse_compress_state"]