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.

Sign up for GitHub

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

Jump to bottom

meteor 1.8 support #122

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

meteor 1.8 support #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cbe14fe
Support meteor 1.8, update mongo to version 4.0.2 and nodejs to 8.11.…
Oct 25, 2018
65fd7df
Removed unused gnupg from apt-get install
Oct 25, 2018
4c6dff9
Added meteor 1.8 support notice
Oct 25, 2018
025329d
Added meteor 1.8 environment
Oct 25, 2018
0367e5d
Added modification hint
Oct 26, 2018
2de5540
Minor changes. Changed documentation commands from jshimko to pixolut…
Oct 26, 2018
6869e82
Fixed typo
Oct 26, 2018
e7e5fc6
Reverted unused commits for easier merge
Oct 29, 2018
75cfd4e
add apt-transport-https to dockerfile
pixlol Dec 17, 2018
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
12 changes: 6 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM debian:jessie
MAINTAINER Jeremy Shimko <[email protected]>
FROM debian:stretch
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

debian:stable is best sollution

MAINTAINER Jeremy Shimko <[email protected]>, Sebastian Lutter <[email protected]>

RUN groupadd -r node && useradd -m -g node node

# Gosu
ENV GOSU_VERSION 1.10

# MongoDB
ENV MONGO_VERSION 3.4.10
ENV MONGO_MAJOR 3.4
ENV MONGO_VERSION 4.0.2
ENV MONGO_MAJOR 4.0
ENV MONGO_PACKAGE mongodb-org

# PhantomJS
Expand All @@ -28,7 +28,7 @@ ONBUILD ARG APT_GET_INSTALL
ONBUILD ENV APT_GET_INSTALL $APT_GET_INSTALL

ONBUILD ARG NODE_VERSION
ONBUILD ENV NODE_VERSION ${NODE_VERSION:-8.9.0}
ONBUILD ENV NODE_VERSION ${NODE_VERSION:-8.11.4}

ONBUILD ARG NPM_TOKEN
ONBUILD ENV NPM_TOKEN $NPM_TOKEN
Expand All @@ -47,7 +47,7 @@ ONBUILD ARG TOOL_NODE_FLAGS
ONBUILD ENV TOOL_NODE_FLAGS $TOOL_NODE_FLAGS

# optionally custom apt dependencies at app build time
ONBUILD RUN if [ "$APT_GET_INSTALL" ]; then apt-get update && apt-get install -y $APT_GET_INSTALL; fi
ONBUILD RUN if [ "$APT_GET_INSTALL" ]; then apt-get update && apt-get install -y apt-transport-https && apt-get install -y $APT_GET_INSTALL; fi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apt-transport-https can be installed by APT_GET_INSTALL, it is not required


# copy the app to the container
ONBUILD COPY . $APP_SOURCE_DIR
Expand Down
11 changes: 11 additions & 0 deletions HISTORY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@

## v2.3.2

- ensure apt-get working with https mirrors via apt-transport-https

## v2.3.1

- Updates for Meteor 1.8 support
- Node 8.11.4
- Mongo 4.0.2

## v2.3.0

- Updates for Meteor 1.6 support
Expand Down
8 changes: 4 additions & 4 deletions dev.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ RUN groupadd -r node && useradd -m -g node node
ENV DEV_BUILD true

# Gosu
ENV GOSU_VERSION 1.10
#ENV GOSU_VERSION 1.10

# MongoDB
ENV MONGO_VERSION 3.4.10
ENV MONGO_MAJOR 3.4
ENV MONGO_VERSION 4.0.2
ENV MONGO_MAJOR 4.0
ENV MONGO_PACKAGE mongodb-org

# PhantomJS
Expand All @@ -34,7 +34,7 @@ ONBUILD ARG APT_GET_INSTALL
ONBUILD ENV APT_GET_INSTALL $APT_GET_INSTALL

ONBUILD ARG NODE_VERSION
ONBUILD ENV NODE_VERSION ${NODE_VERSION:-8.9.0}
ONBUILD ENV NODE_VERSION ${NODE_VERSION:-8.11.4}

ONBUILD ARG INSTALL_MONGO
ONBUILD ENV INSTALL_MONGO ${INSTALL_MONGO:-true}
Expand Down
23 changes: 1 addition & 22 deletions scripts/install-deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,4 @@ if [ -f $APP_SOURCE_DIR/launchpad.conf ]; then
fi
fi

apt-get install -y --no-install-recommends curl bzip2 bsdtar build-essential python git wget


# install gosu

dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"

wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"

export GNUPGHOME="$(mktemp -d)"

gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu

rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc

chmod +x /usr/local/bin/gosu

gosu nobody true

apt-get purge -y --auto-remove wget
apt-get install -y --no-install-recommends curl bzip2 bsdtar build-essential python git gosu
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is ok, but asked community:

#140