Skip to content

Commit 220c15d

Browse files
impactmassimpactmass
committed
Update to meteor 1.8
1 parent e399d39 commit 220c15d

File tree

5 files changed

+159
-1
lines changed

5 files changed

+159
-1
lines changed

‎HISTORY.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## v1.8-meteor
2+
3+
- Update Meteor version to 1.8
4+
- Update node version to 8.11.4
5+
16
## v1.7.0.3-meteor
27

38
- Update Meteor version to v1.7.0.3

‎versions/meteor-1.7.0.3/options‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export TAGS=(v1.7.0.3-meteor latest)
1+
export TAGS=(v1.7.0.3-meteor)
22
export METEOR_VERSION=1.7.0.3
33

‎versions/meteor-1.8/Dockerfile‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
FROM node:8.11.4
2+
3+
ARG METEOR_VERSION
4+
ARG NAME=base
5+
ARG DESCRIPTION="Base Docker image for Reaction."
6+
ARG URL=https://github.com/reactioncommerce/base
7+
ARG DOC_URL=https://github.com/reactioncommerce/base
8+
ARG VCS_URL=https://github.com/reactioncommerce/base
9+
ARG VCS_REF
10+
ARG VENDOR
11+
ARG BUILD_DATE
12+
ARG BUILD_COMPARE_URL
13+
ARG BUILD_ENV=test
14+
ARG BUILD_NUMBER
15+
ARG BUILD_PLATFORM
16+
ARG BUILD_PLATFORM_PROJECT_USERNAME
17+
ARG BUILD_PLATFORM_PROJECT_REPONAME
18+
ARG BUILD_PULL_REQUESTS
19+
ARG BUILD_TRIGGERED_BY_TAG
20+
ARG BUILD_URL
21+
ARG CIRCLE_WORKSPACE_ID
22+
ARG CIRCLE_WORKFLOW_ID
23+
ARG CIRCLE_WORKFLOW_JOB_ID
24+
ARG CIRCLE_WORKFLOW_UPSTREAM_JOB_IDS
25+
ARG CIRCLE_WORKSPACE_ID
26+
ARG GIT_REPOSITORY_URL
27+
ARG GIT_SHA1
28+
ARG LICENSE
29+
30+
LABEL maintainer="Reaction Commerce <[email protected]>" \
31+
com.reactioncommerce.build-date=$BUILD_DATE \
32+
com.reactioncommerce.name=$NAME \
33+
com.reactioncommerce.description=$DESCRIPTION \
34+
com.reactioncommerce.url=$URL \
35+
com.reactioncommerce.vcs-url=$VCS_URL \
36+
com.reactioncommerce.vcs-ref=$VCS_REF \
37+
com.reactioncommerce.vendor=$VENDOR \
38+
com.reactioncommerce.docker.build.compare-url=$BUILD_COMPARE_URL \
39+
com.reactioncommerce.docker.build.number=$BUILD_NUMBER \
40+
com.reactioncommerce.docker.build.platform=$BUILD_PLATFORM \
41+
com.reactioncommerce.docker.build.platform.project.username=$BUILD_PLATFORM_PROJECT_USERNAME \
42+
com.reactioncommerce.docker.build.platform.project.reponame=$BUILD_PLATFORM_PROJECT_REPONAME \
43+
com.reactioncommerce.docker.build.pull-requests=$BUILD_PULL_REQUESTS \
44+
com.reactioncommerce.docker.build.triggered-by-tag=$BUILD_TRIGGERED_BY_TAG \
45+
com.reactioncommerce.docker.build.url=$BUILD_URL \
46+
com.reactioncommerce.docker.build.circle.workflow.id=$CIRCLE_WORKFLOW_ID \
47+
com.reactioncommerce.docker.build.circle.workflow.job.id=$CIRCLE_WORKFLOW_JOB_ID \
48+
com.reactioncommerce.docker.build.circle.workflow.upstream.job.ids=$CIRCLE_WORKFLOW_UPSTREAM_JOB_IDS \
49+
com.reactioncommerce.docker.build.circle.workflow.url=https://circleci.com/workflow-run/$CIRCLE_WORKFLOW_ID \
50+
com.reactioncommerce.docker.build.circle.workspace.id=$CIRCLE_WORKSPACE_ID \
51+
com.reactioncommerce.docker.git.repository.url=$GIT_REPOSITORY_URL \
52+
com.reactioncommerce.docker.git.sha1=$GIT_SHA1 \
53+
com.reactioncommerce.docker.license=$LICENSE
54+
55+
ENV METEOR_VERSION $METEOR_VERSION
56+
ENV REACTION_DOCKER_BUILD true
57+
ENV APP_SOURCE_DIR /opt/reaction/src
58+
ENV APP_BUNDLE_DIR /opt/reaction/dist
59+
ENV PATH $PATH:/home/node/.meteor
60+
61+
RUN apt-get update \
62+
&& apt-get install -y --no-install-recommends \
63+
build-essential \
64+
bsdtar \
65+
bzip2 \
66+
ca-certificates \
67+
git \
68+
python \
69+
wget \
70+
&& rm -rf /var/lib/apt/lists/*
71+
72+
RUN mkdir -p "$APP_SOURCE_DIR" \
73+
&& mkdir -p "$APP_BUNDLE_DIR" \
74+
&& chown -R node "$APP_SOURCE_DIR" \
75+
&& chown -R node "$APP_BUNDLE_DIR"
76+
77+
RUN npm i -g reaction-cli
78+
79+
USER node
80+
81+
################################
82+
# install-meteor
83+
# replaces tar command with bsdtar in the install script (bsdtar -xf "$TARBALL_FILE" -C "$INSTALL_TMPDIR")
84+
# https://github.com/jshimko/meteor-launchpad/issues/39
85+
################################
86+
RUN wget -O /tmp/install_meteor.sh https://install.meteor.com \
87+
&& sed -i.bak "s/RELEASE=.*/RELEASE=\"$METEOR_VERSION\"/g" /tmp/install_meteor.sh \
88+
&& sed -i.bak "s/tar -xzf.*/bsdtar -xf \"\$TARBALL_FILE\" -C \"\$INSTALL_TMPDIR\"/g" /tmp/install_meteor.sh \
89+
&& printf "\\n[-] Installing Meteor %s...\\n" "$METEOR_VERSION" \
90+
&& sh /tmp/install_meteor.sh \
91+
&& rm /tmp/install_meteor.sh
92+
93+
WORKDIR $APP_SOURCE_DIR
94+
COPY test-script.sh .
95+
# Node flags for the Meteor build tool
96+
ONBUILD ARG TOOL_NODE_FLAGS
97+
ONBUILD ENV TOOL_NODE_FLAGS $TOOL_NODE_FLAGS

‎versions/meteor-1.8/options‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export TAGS=(v1.8-meteor latest)
2+
export METEOR_VERSION=1.8
3+

‎versions/meteor-1.8/test-script.sh‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
#!/bin/bash
2+
3+
echo "#### Starting check for correct Meteor installation"
4+
INSTALLED_METEOR_VERSION=$(meteor --version)
5+
if [ "$INSTALLED_METEOR_VERSION" == "Meteor $METEOR_VERSION" ]; then
6+
echo "Success: Meteor version confirmed";
7+
else
8+
echo "Error: Expected Meteor version $METEOR_VERSION. Found $INSTALLED_METEOR_VERSION"
9+
exit 1;
10+
fi
11+
12+
echo "#### Starting check for APP_SOURCE_DIR"
13+
if [ -d "$APP_SOURCE_DIR" ]; then
14+
echo "Success: APP_SOURCE_DIR exists";
15+
else
16+
echo "Error: APP_SOURCE_DIR $APP_SOURCE_DIR not found";
17+
exit 1;
18+
fi
19+
20+
echo "#### Starting check for APP_SOURCE_DIR owner"
21+
APP_SOURCE_DIR_OWNER=$(ls -ld "$APP_SOURCE_DIR" | awk '{print $3}');
22+
if [ "$APP_SOURCE_DIR_OWNER" == "node" ]; then
23+
echo "Success: APP_SOURCE_DIR is owned by node user";
24+
else
25+
echo "Error: APP_SOURCE_DIR not owned by node user";
26+
exit 1;
27+
fi
28+
29+
echo "#### Starting check for APP_BUNDLE_DIR"
30+
if [ -d "$APP_BUNDLE_DIR" ]; then
31+
echo "Success: APP_BUNDLE_DIR exists";
32+
else
33+
echo "Error: APP_BUNDLE_DIR $APP_BUNDLE_DIR not found";
34+
exit 1;
35+
fi
36+
37+
echo "#### Starting check for APP_BUNDLE_DIR owner"
38+
APP_BUNDLE_DIR_OWNER=$(ls -ld "$APP_BUNDLE_DIR" | awk '{print $3}');
39+
if [ "$APP_BUNDLE_DIR_OWNER" == "node" ]; then
40+
echo "Success: APP_BUNDLE_DIR owned by node user";
41+
else
42+
echo "Error: APP_BUNDLE_DIR NOT owned by node user";
43+
exit 1;
44+
fi
45+
46+
echo "#### Starting check for REACTION CLI"
47+
REACTION_CLI_VERSION=$(reaction -v | grep Reaction);
48+
if [[ "$REACTION_CLI_VERSION" =~ "Reaction CLI:" ]]; then
49+
echo "Success: REACTION CLI found";
50+
else
51+
echo "Error: REACTION CLI not installed";
52+
exit 1;
53+
fi

0 commit comments

Comments
 (0)