Skip to content
This repository has been archived by the owner on Aug 5, 2024. It is now read-only.

Commit

Permalink
Merge pull request #114 from itsthejb/3.1.13p1
Browse files Browse the repository at this point in the history
  • Loading branch information
itsthejb authored Mar 31, 2019
2 parents 214be29 + 8d2935b commit cd7b3a6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LABEL description="ISPConfig 3.1 on Debian Stretch, with Roundcube mail, phpMyAd
# All arguments
ARG BUILD_CERTBOT="yes"
ARG BUILD_HOSTNAME="myhost.test.com"
ARG BUILD_ISPCONFIG="3-stable"
ARG BUILD_ISPCONFIG_VERSION="3.1.13p1"
ARG BUILD_ISPCONFIG_DROP_EXISTING="no"
ARG BUILD_ISPCONFIG_MYSQL_DATABASE="dbispconfig"
ARG BUILD_ISPCONFIG_PORT="8080"
Expand Down Expand Up @@ -230,9 +230,9 @@ RUN git clone https://github.com/w2c/ispconfig3_roundcube.git /tmp/ispconfig3_ro
# --- 20 Install ISPConfig 3
cd /tmp; \
cd .; \
wget https://ispconfig.org/downloads/ISPConfig-${BUILD_ISPCONFIG}.tar.gz; \
wget https://ispconfig.org/downloads/ISPConfig-${BUILD_ISPCONFIG_VERSION}.tar.gz; \
cd /tmp; \
tar xfz ISPConfig-${BUILD_ISPCONFIG}.tar.gz
tar xfz ISPConfig-${BUILD_ISPCONFIG_VERSION}.tar.gz
ADD ./build/autoinstall.ini /tmp/ispconfig3_install/install/autoinstall.ini
RUN \
touch /etc/mailname; \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ It is possible to connect to a remote SQL server during the build. This would re

| Argument | Default | Comments |
|----------------------------------|-------------------|----------|
| `BUILD_ISPCONFIG` | `3-stable` | Version of ISPConfig to install
| `BUILD_ROUNDCUBE` | `1.3.8` | Version of [Roundcube to install](https://roundcube.net/download/)
| `BUILD_ISPCONFIG_VERSION` | | Version of ISPConfig to install
| `BUILD_ROUNDCUBE` | | Version of [Roundcube to install](https://roundcube.net/download/)
| `BUILD_ROUNDCUBE_DIR` | `/opt/roundcube` | Path where Roundcube will be installed. **Don't change!**

### Currently non-functional
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
##################################################
# RUN section
##################################################
image: itsthejb/ispconfig:0.5.1
image: itsthejb/ispconfig:0.5.2
container_name: ispconfig
hostname: ispconfig
domainname: test.com
Expand Down

0 comments on commit cd7b3a6

Please sign in to comment.