Skip to content

Commit

Permalink
Merge pull request #3 from liminspace/version_1.2
Browse files Browse the repository at this point in the history
Version 1.2
  • Loading branch information
liminspace authored Aug 21, 2024
2 parents 0351c43 + 0828eed commit 6f098f2
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 9 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,7 @@ tests/db.sqlite3
node_modules/
package-lock.json
package.json
.node-version

# pyenv
.python-version
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
1.2 (2024-08-21)
==================
* Upgraded base node image to 20-bookworm
* Upgraded MJML to 4.15.2
* Updated Dockerfile


1.1 (2022-10-06)
==================
* Upgraded MJML to 4.13.0
Expand Down
13 changes: 6 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
FROM node:14-bullseye
FROM node:20-bookworm

ARG MJML_VERSION=4.13.0
ARG MJML_VERSION=4.15.2
ARG EXPOSE=28101

ENV WORKDIR /app
ENV SCRIPTSDIR /scripts
ENV PATH "$SCRIPTSDIR:${PATH}"
ENV WORKDIR=/app
ENV SCRIPTSDIR=/scripts
ENV PATH="$SCRIPTSDIR:${PATH}"
ENV HOST="0.0.0.0"
ENV PORT=$EXPOSE

COPY entrypoint.sh $SCRIPTSDIR/
RUN chmod +x $SCRIPTSDIR/*.sh

WORKDIR $WORKDIR

RUN set -ex; \
npm init -y; \
npm install mjml@${MJML_VERSION}

COPY tcpserver.js $WORKDIR/

WORKDIR $WORKDIR

EXPOSE $EXPOSE

ENTRYPOINT ["entrypoint.sh"]
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Build the image::
You can specify build arguments::

$ docker build -t mjml-tcpserver \
--build-arg MJML_VERSION=4.13.0 \
--build-arg MJML_VERSION=4.15.2 \
--build-arg EXPOSE=28101 \
--no-cache .

Expand Down Expand Up @@ -103,7 +103,7 @@ Example::
build:
context: .
args:
- MJML_VERSION=4.13.0
- MJML_VERSION=4.15.2
- EXPOSE=28103
restart: always
ports:
Expand Down

0 comments on commit 6f098f2

Please sign in to comment.