Skip to content

Commit

Permalink
Update Mendelson version to 1.1b53
Browse files Browse the repository at this point in the history
  * Moved version to environment file;
  * Added the option to start container with make;
  * README update.
  • Loading branch information
savermyas committed Oct 1, 2018
1 parent c495d6b commit c11fd19
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 9 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MENDELSON_VERSION=1.1b53
17 changes: 11 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
MENDELSON_AS2_VERSION = 1.1b51
include .env

.PHONY : image
.PHONY : image start

image : image/mendelson-$(MENDELSON_AS2_VERSION).zip
docker build image -t saver/mendelson-as2:$(MENDELSON_AS2_VERSION)
image : image/mendelson-$(MENDELSON_VERSION).zip
docker build --build-arg MENDELSON_VERSION=$(MENDELSON_VERSION) -t saver/mendelson-as2:$(MENDELSON_VERSION) image

image/mendelson-$(MENDELSON_AS2_VERSION).zip :
curl -L http://downloads.sourceforge.net/project/mec-as2/install_mendelson_opensource_as2_$(MENDELSON_AS2_VERSION).zip > $@
image/mendelson-$(MENDELSON_VERSION).zip :
curl -L http://downloads.sourceforge.net/project/mec-as2/install_mendelson_opensource_as2_$(MENDELSON_VERSION).zip > $@

start :
docker-compose up -d
HTTP_PORT=$$(docker-compose port as2 8080 | cut -d: -f2);\
echo Use http://localhost:$${HTTP_PORT} to connect to your Mendelson AS2
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,16 @@ You may just skip the build and use image from Docker Hub

docker-compose up -d

or

make start

2. Look for port mappings with command:

docker-compose ps


3. Use browser and vncviewer with appropriate ports and password from files 'wd/vncpasswd' and 'wd/webpasswd', watch
3. Use browser and vncviewer with appropriate ports and password from files 'image/custom/vncpasswd' and 'image/custom/webpasswd', watch
logs in wd folder


Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
as2:
container_name: mendelson-as2
build: image
image: saver/mendelson-as2:1.1b51
image: "saver/mendelson-as2:${MENDELSON_VERSION}"
ports:
- "5901"
- "8080"
Expand Down
2 changes: 1 addition & 1 deletion image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM centos:7.3.1611
MAINTAINER Dmitry Myasnikov <[email protected]>

ENV MENDELSON_HOME /opt/mendelson/as2
ENV MENDELSON_VERSION 1.1b51
ARG MENDELSON_VERSION=1.1b51

RUN yum install -y java-1.8.0-openjdk unzip tigervnc-server xorg-x11-server-Xvfb && \
yum clean all && mkdir -p $MENDELSON_HOME
Expand Down

0 comments on commit c11fd19

Please sign in to comment.