From 0f7a75bf70b5c0641514703af47ccb79dcd7a856 Mon Sep 17 00:00:00 2001 From: Showdown76 Date: Sun, 14 Apr 2024 21:42:36 +0000 Subject: [PATCH 1/8] local pelican image --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2ff5b78..7f62dad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: volumes: - data:/var/lib/mysql pelican: - image: pelican + image: ./pelican environment: [] volumes: - ./pelican:/app \ No newline at end of file From c99d3ae873915315e14a4daa98af01a42549f307 Mon Sep 17 00:00:00 2001 From: Showdown76 Date: Sun, 14 Apr 2024 21:43:20 +0000 Subject: [PATCH 2/8] Actualiser docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7f62dad..74d9415 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: volumes: - data:/var/lib/mysql pelican: - image: ./pelican + build: ./pelican environment: [] volumes: - ./pelican:/app \ No newline at end of file From 6ea43b7f063cc404c66e52c543b31a966bcbafac Mon Sep 17 00:00:00 2001 From: Showdown76 Date: Sun, 14 Apr 2024 22:58:01 +0000 Subject: [PATCH 3/8] chore: env, working????????? --- docker-compose.yml | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 74d9415..69389d5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,8 @@ version: '3.8' -volumes: - data: services: - db: + mariadb: image: mariadb + container_name: mariadb environment: MYSQL_ROOT_PASSWORD: pelican MYSQL_DATABASE: pelican @@ -13,6 +12,45 @@ services: - data:/var/lib/mysql pelican: build: ./pelican - environment: [] + environment: + APP_ENV: production + APP_DEBUG: false + APP_KEY: + APP_TIMEZONE: Europe/Paris + APP_URL: https://pelican.tarkacore.dev + APP_LOCALE: en + APP_ENVIRONMENT_ONLY: true + + LOG_CHANNEL: daily + LOG_STACK: single + LOG_DEPRECATIONS_CHANNEL: null + LOG_LEVEL: debug + + DB_CONNECTION: mysql + DB_HOST: mariadb + DB_DATABASE: panel + DB_USERNAME: panel + DB_PASSWORD: panel + + CACHE_STORE: file + QUEUE_CONNECTION: sync + SESSION_DRIVER: file + + HASHIDS_SALT: pipi1234 + HASHIDS_LENGTH: 8 + + MAIL_MAILER: log + MAIL_HOST: smtp.example.com + MAIL_PORT: 25 + MAIL_USERNAME: none + MAIL_PASSWORD: none + MAIL_ENCRYPTION: tls + MAIL_FROM_ADDRESS: support@tarkacore.dev + MAIL_FROM_NAME: TarkaPelican + # Set this to your domain to prevent it defaulting to 'localhost', causing mail servers such as Gmail to reject your mail + # MAIL_EHLO_DOMAIN=panel.example.com + SESSION_ENCRYPT: false + SESSION_PATH: / + SESSION_DOMAIN: null volumes: - ./pelican:/app \ No newline at end of file From 583c1839c11814664b06ed49e88e9f8e72a373a5 Mon Sep 17 00:00:00 2001 From: Showdown76 Date: Sun, 14 Apr 2024 23:00:45 +0000 Subject: [PATCH 4/8] Dockerfile patch --- pelican-Dockerfile.patch | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pelican-Dockerfile.patch diff --git a/pelican-Dockerfile.patch b/pelican-Dockerfile.patch new file mode 100644 index 0000000..5661f45 --- /dev/null +++ b/pelican-Dockerfile.patch @@ -0,0 +1,32 @@ +diff --git a/Dockerfile b/Dockerfile +index 95d0fefe..5ab7e654 100644 +--- a/Dockerfile ++++ b/Dockerfile +@@ -2,7 +2,8 @@ + # Build the assets that are needed for the frontend. This build stage is then discarded + # since we won't need NodeJS anymore in the future. This Docker image ships a final production + # level distribution +-FROM --platform=$TARGETOS/$TARGETARCH mhart/alpine-node:14 ++FROM --platform=$TARGETOS/$TARGETARCH node:lts-alpine3.19 ++ + WORKDIR /app + COPY . ./ + RUN yarn install --frozen-lockfile \ +@@ -10,13 +11,15 @@ RUN yarn install --frozen-lockfile \ + + # Stage 1: + # Build the actual container with all of the needed PHP dependencies that will run the application. +-FROM --platform=$TARGETOS/$TARGETARCH php:8.1-fpm-alpine ++FROM --platform=$TARGETOS/$TARGETARCH php:8.2-fpm-alpine + WORKDIR /app + COPY . ./ + COPY --from=0 /app/public/assets ./public/assets +-RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar unzip nginx libpng-dev libxml2-dev libzip-dev certbot certbot-nginx \ ++RUN apk add --no-cache --update icu-dev ca-certificates dcron curl git supervisor tar unzip nginx libpng-dev libxml2-dev libzip-dev certbot certbot-nginx \ + && docker-php-ext-configure zip \ + && docker-php-ext-install bcmath gd pdo_mysql zip \ ++ && docker-php-ext-configure intl \ ++ && docker-php-ext-install intl \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ + && cp .env.example .env \ + && mkdir -p bootstrap/cache/ storage/logs storage/framework/sessions storage/framework/views storage/framework/cache \ From 2060413bfefddc238d5b2a0772aa8f0fd5bcc8db Mon Sep 17 00:00:00 2001 From: Showdown76 Date: Sun, 14 Apr 2024 23:04:42 +0000 Subject: [PATCH 5/8] open port :3 --- docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 69389d5..9f9cba5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -53,4 +53,6 @@ services: SESSION_PATH: / SESSION_DOMAIN: null volumes: - - ./pelican:/app \ No newline at end of file + - ./pelican:/app + ports: + - 80:80 \ No newline at end of file From ac3211643382fa48daf99cc7d818a4d460f871b8 Mon Sep 17 00:00:00 2001 From: Showdown76 Date: Sun, 14 Apr 2024 23:05:21 +0000 Subject: [PATCH 6/8] local volume for mariadb svc --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9f9cba5..5c05204 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: MYSQL_USER: pelican MYSQL_PASSWORD: pelican volumes: - - data:/var/lib/mysql + - ./mariadb:/var/lib/mysql pelican: build: ./pelican environment: From 7141b3d145430d82f37cc799a91c3ef7805ca421 Mon Sep 17 00:00:00 2001 From: Showdown76 Date: Sun, 14 Apr 2024 23:18:37 +0000 Subject: [PATCH 7/8] right password for db --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5c05204..0d9a28c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,9 +28,9 @@ services: DB_CONNECTION: mysql DB_HOST: mariadb - DB_DATABASE: panel - DB_USERNAME: panel - DB_PASSWORD: panel + DB_DATABASE: pelican + DB_USERNAME: pelican + DB_PASSWORD: pelican CACHE_STORE: file QUEUE_CONNECTION: sync From 2fd7e7b8c52adc10111b16cb8a9a6474bbee3a90 Mon Sep 17 00:00:00 2001 From: Showdown76 Date: Sun, 14 Apr 2024 23:19:31 +0000 Subject: [PATCH 8/8] pelican container name --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 0d9a28c..b589126 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,7 @@ services: - ./mariadb:/var/lib/mysql pelican: build: ./pelican + container_name: pelican environment: APP_ENV: production APP_DEBUG: false