Skip to content

Commit

Permalink
Merge pull request #104 from jakowenko/beta
Browse files Browse the repository at this point in the history
v1.0.0
  • Loading branch information
jakowenko authored Sep 21, 2021
2 parents de4360d + d11aa3e commit 69708d8
Show file tree
Hide file tree
Showing 87 changed files with 7,082 additions and 1,601 deletions.
2 changes: 1 addition & 1 deletion Dockerfile → .build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ WORKDIR /double-take

RUN npm install nodemon -g

COPY /entrypoint.sh .
COPY /.build/entrypoint.sh .

ENV NODE_ENV=production

Expand Down
File renamed without changes.
3 changes: 3 additions & 0 deletions .develop/build
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

docker build -f ./.build/Dockerfile -t double-take .
3 changes: 3 additions & 0 deletions .develop/docker
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

docker compose -p double-take -f ./.develop/docker-compose.yml $1 $2
39 changes: 39 additions & 0 deletions .develop/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
version: '3.7'

services:
frontend:
container_name: double-take-frontend
command: npm run frontend
depends_on:
- api
build:
context: ../
dockerfile: ./.develop/Dockerfile.dev
ports:
- 8080:8080
volumes:
- ..:/double-take
- /double-take/frontend/node_modules

api:
container_name: double-take-api
entrypoint: .develop/entrypoint.dev.sh
depends_on:
- mqtt
build:
context: ../
dockerfile: ./.develop/Dockerfile.dev
ports:
- 3000:3000
volumes:
- ..:/double-take
- /double-take/api/node_modules

mqtt:
container_name: double-take-mqtt
restart: unless-stopped
image: eclipse-mosquitto
volumes:
- ./mosquitto.conf:/mosquitto/config/mosquitto.conf
ports:
- 1883:1883
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
*

!entrypoint.sh
!.build/entrypoint.sh
!frontend/*
!api/*

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: .
file: ./.build/Dockerfile
platforms: ${{env.ARCH}}
push: true
tags: jakowenko/double-take:${{env.VERSION}},jakowenko/double-take:${{env.TAG}}
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: release

on:
push:
branches:
- master
jobs:
release:
name: Release
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: 14
- name: Install dependencies
run: npm ci
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: npx semantic-release
Loading

0 comments on commit 69708d8

Please sign in to comment.