diff --git a/Dockerfile b/Dockerfile index a1af72b..0903851 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM golang:latest AS go_builder WORKDIR /app -COPY ./admin-dashboard-backend/main /app/main +COPY ./main /app/main # Stage 2: Create the final image with Python 3 and the Go binary # Python is needed for the group tasks @@ -14,7 +14,7 @@ WORKDIR /app # Copy the Go binary from the previous stage COPY --from=go_builder /app/main /app/main -COPY ./admin-dashboard-backend/public/swagger/ /app/swagger +COPY ./public/swagger/ /app/swagger # Set up any Python dependencies you might need # RUN pip install ... diff --git a/docker-compose.yml b/docker-compose.yml index eb0fd9a..1f1b8ca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,37 +7,3 @@ services: build: context: . dockerfile: Dockerfile - depends_on: - - mariadb - restart: always - volumes: - - jnx_admin_dashboard_server_data:/app - # CHANGE HERE - ONLY THE PATH ON YOUR SYSTEM: path_on_your_system:path_on_container - - ./admin-dashboard-data:/admin-dashboard-data - networks: - - jnx-admin-dashboard-network - environment: - - DOCKER=true - - DEBUG=true - - COLORIZED_OUTPUT=true - - HOST=0.0.0.0 - - PORT=8080 - - LOG_MANAGER_SERVER_URL=http://localhost:3000 - - FOLDER_GROUPTASKS_GROUPS=/admin-dashboard-data/groupTasks/groups/ - - FOLDER_GROUPTASKS_RUNNINGTASKS=/admin-dashboard-data/groupTasks/runningTasks/ - - FOLDER_PUBLIC_STATIC=/admin-dashboard-data/public/ - - LOG_LANGUAGE_GROUPTASKS=./grouptasks_lang_log_messages.json - - LOG_LANGUAGE_SYSTEM=./system_lang_log_messages.json - - MARIADB_HOSTNAME=mariadb - - MARIADB_PORT=3306 - - MARIADB_USERNAME=admindashboard - - MARIADB_PASSWORD=QHXNcxuRRyAdxCxVCmPkEuCsPfCdfLz2 - - MARIADB_DATABASE_NAME=jnxadmindashboard - - INVEX_API_BASE=https://XXXXXX # CHANGE HERE - - INVEX_API_TOKEN=XXXXXXXXXXX # CHANGE HERE - -volumes: - jnx_admin_dashboard_server_data: - -networks: - jnx-admin-dashboard-network: