Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PLA-1674] Remove daemon submodule use image from dockerhub #37

Merged
merged 7 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Autodetect text files
* text=auto
# Ensure text files uses LF.
* text=lf

# Ensure shell script uses LF.
# Ensure shell script uses LF and bat script CRLF.
Dockerfile eol=lf
*.sh eol=lf
.env eol=lf
*.bat eol=crlf
.env eol=lf
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

16 changes: 8 additions & 8 deletions configs/core/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage: setup-web-server
FROM php:apache-buster as setup-web-server
FROM php:apache-buster AS setup-web-server

# Install dependencies
RUN apt-get update -y && \
Expand All @@ -20,7 +20,7 @@ RUN docker-php-ext-install ffi pdo pdo_mysql gmp bcmath sodium mysqli sockets pc
RUN docker-php-ext-enable redis imagick

# Stage: create-application
FROM setup-web-server as create-application
FROM setup-web-server AS create-application

WORKDIR /app/
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
Expand All @@ -32,7 +32,7 @@ COPY configs/core/config/ /app/laravel-application/config/
COPY configs/core/routes/ /app/laravel-application/routes/

# Stage: composer-update
FROM create-application as composer-update
FROM create-application AS composer-update

RUN cd laravel-application && \
composer update --prefer-dist --no-dev --optimize-autoloader --no-interaction --ignore-platform-reqs
Expand All @@ -41,7 +41,7 @@ RUN cd laravel-application && \
RUN cd /app/laravel-application/vendor/gmajor/sr25519-bindings/go && go build -buildmode=c-shared -o sr25519.so . && mv sr25519.so ../src/Crypto/sr25519.so

# Stage: http setup
FROM create-application as http-setup
FROM create-application AS http-setup

# Set ServerName to be localhost.
RUN echo 'ServerName localhost' >> /etc/apache2/apache2.conf
Expand Down Expand Up @@ -69,16 +69,16 @@ COPY configs/core/php /usr/local/etc/php/conf.d
COPY configs/core/supervisor /etc/supervisor

# Stage: platform-core
FROM http-setup as enjin-platform
FROM http-setup AS enjin-platform

LABEL org.opencontainers.image.source=https://github.com/enjin/platform
LABEL org.opencontainers.image.description="Enjin Platform - The most powerful and advanced open-source framework for building NFT platforms."
LABEL org.opencontainers.image.licenses=LGPL-3.0-only

WORKDIR /var/www/html

COPY configs/core/start.sh /usr/local/bin/start
RUN dos2unix /usr/local/bin/start
COPY configs/core/start.sh /usr/local/bin/start.sh
RUN dos2unix /usr/local/bin/start.sh

USER www-data
CMD ["/usr/local/bin/start"]
CMD ["/usr/local/bin/start.sh"]
8 changes: 3 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
- "${REDIS_EXTERNAL_PORT}:6379"

decoder:
platform: linux/x86_64
platform: linux/amd64
image: enjin/platform-decoder:latest
restart: unless-stopped
ports:
Expand Down Expand Up @@ -107,10 +107,8 @@ services:
- "host.docker.internal:host-gateway"

daemon:
image: enjin/daemon:latest
build:
context: ./wallet-daemon
dockerfile: Dockerfile
platform: linux/amd64
image: enjin/wallet-daemon:latest
restart: unless-stopped
env_file:
- ./configs/daemon/.env
Expand Down