Skip to content

Commit

Permalink
Merge pull request #3 from EvoTM/develop
Browse files Browse the repository at this point in the history
Added memory limit and evosc_version variable.
  • Loading branch information
ItsPhenom authored Sep 19, 2021
2 parents 3e94280 + e5425da commit 1be5a33
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@ jobs:
tags: ${{ steps.prep.outputs.tags }}
build-args: |
BUILD_DATE=${{ steps.prep.outputs.builddate }}
REVISION=${{ steps.prep.outputs.revision }}
REVISION=${{ steps.prep.outputs.revision }}
EVOSC_VERSION=${{ steps.prep.outputs.version }}
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ ARG EVOSC_GIT="https://github.com/EvoTM/EvoSC.git"
ARG EVOSC_BRANCH="develop"
ARG BUILD_DATE
ARG REVISION
ARG EVOSC_VERSION

# labels
LABEL org.opencontainers.image.title="EvoSC Trackmania/ManiaPlanet Server Controller" \
org.opencontainers.image.description="Server Controller for Trackmania and ManiaPlanet servers." \
#org.opencontainers.image.version=${EVOSC_VERSION} \
org.opencontainers.image.version=${EVOSC_VERSION} \
org.opencontainers.image.created=${BUILD_DATE} \
org.opencontainers.image.authors="Nicolas Graf <[email protected]>" \
org.opencontainers.image.vendor="Evo" \
Expand All @@ -34,6 +35,9 @@ COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
RUN docker-php-ext-configure gd --with-jpeg && docker-php-ext-install gd && \
docker-php-ext-install curl mysqli pdo_mysql zip pcntl

# increase default memory limit
RUN echo 'memory_limit = 512M' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini

# install evosc
RUN git clone --branch ${EVOSC_BRANCH} ${EVOSC_GIT} /controller && \
composer i --no-dev && \
Expand Down

0 comments on commit 1be5a33

Please sign in to comment.