Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit 3688914

Browse files
Merge pull request #29 from thefringeninja/farewell-container
Remove Output Container
2 parents 121ee2b + ffb952d commit 3688914

File tree

5 files changed

+7
-146
lines changed

5 files changed

+7
-146
lines changed

Dockerfile

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
FROM microsoft/dotnet:2.1.500-sdk-alpine3.7 as version
1+
FROM microsoft/dotnet:2.2.102-sdk-stretch as version
22

33
WORKDIR /src
44

55
COPY .git ./
66

7-
RUN apk add libcurl --no-cache && \
8-
dotnet tool install -g minver-cli --version 1.0.0-beta.1 && \
7+
RUN dotnet tool install -g minver-cli --version 1.0.0-beta.2 && \
98
/root/.dotnet/tools/minver > .version
109

1110
FROM node:10.12.0-alpine AS build
@@ -34,16 +33,4 @@ RUN \
3433
echo "@sqlstreamstore:registry=https://www.myget.org/F/sqlstreamstore/npm/" >> .npmrc && \
3534
yarn publish --new-version $(cat .version) --no-git-tag-version ;\
3635
else echo "No API key found, skipping publishing..." ;\
37-
fi
38-
39-
FROM nginx:1.15.5-alpine AS runtime
40-
41-
WORKDIR /etc/nginx
42-
43-
COPY ./nginx/ ./
44-
45-
COPY --from=publish /app/dist/ /var/www/
46-
47-
EXPOSE 80
48-
49-
ENTRYPOINT ["nginx", "-g", "daemon off;"]
36+
fi

build.sh

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,6 @@
22

33
set -e
44

5-
LOCAL_IMAGE="sql-stream-store-browser"
6-
LOCAL="${LOCAL_IMAGE}:latest"
7-
8-
REMOTE_IMAGE="sqlstreamstore/browser"
9-
105
docker build \
116
--build-arg MYGET_API_KEY=$MYGET_API_KEY \
12-
--tag ${LOCAL} \
137
.
14-
15-
VERSION=$(docker run --entrypoint=cat ${LOCAL} /var/www/.version)
16-
17-
SEMVER_REGEX="^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(\\-[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?(\\+[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?$"
18-
19-
[[ $VERSION =~ $SEMVER_REGEX ]]
20-
21-
MAJOR="${REMOTE_IMAGE}:${BASH_REMATCH[1]}"
22-
MAJOR_MINOR="${REMOTE_IMAGE}:${BASH_REMATCH[1]}.${BASH_REMATCH[2]}"
23-
MAJOR_MINOR_PATCH="${REMOTE_IMAGE}:${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}"
24-
MAJOR_MINOR_PATCH_PRE="${REMOTE_IMAGE}:${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}${BASH_REMATCH[4]}"
25-
26-
if [[ -n $TRAVIS_TAG && -z ${BASH_REMATCH[4]} ]]; then
27-
echo "Detected a tag with no prerelease."
28-
docker tag $LOCAL $MAJOR_MINOR_PATCH
29-
docker tag $LOCAL $MAJOR_MINOR
30-
if [[ ${BASH_REMATCH[1]} != "0" ]]; then
31-
docker tag $LOCAL $MAJOR
32-
else
33-
echo "Detected unstable version."
34-
fi
35-
else
36-
echo "Detected a prerelease."
37-
docker tag $LOCAL $MAJOR_MINOR_PATCH_PRE
38-
fi
39-
40-
if [[ -n $DOCKER_USER ]]; then
41-
echo "${DOCKER_PASS}" | docker login --username "${DOCKER_USER}" --password-stdin
42-
docker push $REMOTE_IMAGE
43-
fi
44-
45-
docker images --filter=reference="${REMOTE_IMAGE}"

nginx/mime.types

Lines changed: 0 additions & 4 deletions
This file was deleted.

nginx/nginx.conf

Lines changed: 0 additions & 87 deletions
This file was deleted.

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
"files": [
1717
"dist",
1818
"README.md",
19-
"src"
19+
"src",
20+
"*.json",
21+
"yarn.lock",
22+
"public/*"
2023
],
2124
"private": false,
2225
"devDependencies": {

0 commit comments

Comments
 (0)