Fixing docker build issues

This commit is contained in:
Benjamin Sherriff
2024-03-03 15:24:11 -05:00
parent 57286bb0e7
commit b682321a53
4 changed files with 17 additions and 13 deletions

16
.gitignore vendored
View File

@@ -1,9 +1,15 @@
.env # Common
target/
.idea/
keys/ keys/
**/Cargo.lock .env
.DS_Store
# Service
target/
**/Cargo.lock
# UI
.next/ .next/
node_modules/ node_modules/
# IDE
.idea/
.DS_Store

View File

@@ -9,15 +9,15 @@ DATABASE_PORT=5432
KEYS_DIR_PATH= KEYS_DIR_PATH=
SESSION_TTL=1440 SESSION_TTL=1440
REDIS_HOST=localhost
REDIS_PORT=6379
MINIO_ROOT_USER=siren MINIO_ROOT_USER=siren
MINIO_ROOT_PASSWORD= MINIO_ROOT_PASSWORD=
MINIO_HOST=localhost MINIO_HOST=localhost
MINIO_PORT=9000 MINIO_PORT=9000
MINIO_PORT_INTERNAL=9001 MINIO_PORT_INTERNAL=9001
REDIS_HOST=localhost
REDIS_PORT=6379
SERVICE_HOST=localhost SERVICE_HOST=localhost
SERVICE_PORT=5000 SERVICE_PORT=5000
DATA_DIR_PATH= DATA_DIR_PATH=

View File

@@ -32,12 +32,10 @@ WORKDIR /packages
ARG TARGETPLATFORM ARG TARGETPLATFORM
RUN apt-get update && apt-get install -y curl tar xz-utils && \ RUN apt-get update && apt-get install -y curl tar xz-utils && \
if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ if [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \
echo "Unsupported platform: amd64" && false; \
elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \
curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_linux_armv7l > yt-dlp && \ curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_linux_armv7l > yt-dlp && \
chmod +x yt-dlp; \ chmod +x yt-dlp; \
elif [ "$TARGETPLATFORM" = "linux/aarch64" ]; then \ elif [ "$TARGETPLATFORM" = "linux/aarch64" ] | [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_linux_aarch64 > yt-dlp && \ curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_linux_aarch64 > yt-dlp && \
chmod +x yt-dlp; \ chmod +x yt-dlp; \
elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \

View File

@@ -26,7 +26,7 @@ services:
DATA_DIR_PATH: /data DATA_DIR_PATH: /data
KEYS_DIR_PATH: /keys KEYS_DIR_PATH: /keys
volumes: volumes:
- ${DATA_DIR_PATH}:/data - ${DATA_DIR_PATH:-~/data}:/data
ports: ports:
- ${SERVICE_PORT:-5000}:5000 - ${SERVICE_PORT:-5000}:5000
depends_on: depends_on: