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.

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

Create a Tornjak image v1.4.0 #286

Merged
merged 58 commits into from
Aug 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
e7012d3
Create a new version v1.4
mrsabath Jun 19, 2023
9423956
Updated golang version and one spire package
maia-iyer Jun 19, 2023
bba5af8
updating reliant code
maia-iyer Jun 20, 2023
4be4310
Removed some code dependent on older SPIRE
maia-iyer Jun 21, 2023
d89193d
Fixing lint
maia-iyer Jun 21, 2023
00347d0
Makefile update
maia-iyer Jun 21, 2023
5dfbf91
Update CI
maia-iyer Jun 22, 2023
2081a3a
Updated CI typo
maia-iyer Jun 22, 2023
c0dd9ae
Increasing lint timeout
maia-iyer Jun 22, 2023
9bcb327
Upgrade Golang version and SPIRE libraries used #271 (#272)
mrsabath Jun 27, 2023
b1d6fd7
Align Node version with LTS used in Dockerfile.tornjak-container
marcofranssen Jun 27, 2023
047fbc8
Print workflow information to Summary
marcofranssen Jun 27, 2023
744aab7
Pin checkout action on patch release 3.5.3
marcofranssen Jun 27, 2023
346df3e
Pin setup-go action on patch release 4.0.1
marcofranssen Jun 27, 2023
1126c7a
Pin setup-node action on patch release 3.6.0
marcofranssen Jun 27, 2023
8d2b117
Add dependabot config for github actions
marcofranssen Jun 27, 2023
6834080
Pin golangci-lint action on patch release 3.6.0
marcofranssen Jun 27, 2023
70937d2
Pin docker-login action on patch release 2.2.0
marcofranssen Jun 27, 2023
2d9030f
Add white lines for readability of workflow
marcofranssen Jun 27, 2023
ee2163d
Run go fmt on project
marcofranssen Jun 30, 2023
064b996
Improve workflow (#279)
mrsabath Jun 30, 2023
e36ee98
Merge branch 'v1.4' into align-node-version
mrsabath Jun 30, 2023
bfd233d
Align Node version with LTS used in Dockerfile.tornjak-container (#277)
mrsabath Jun 30, 2023
a6f03bd
Run go fmt on project (#281)
mrsabath Jun 30, 2023
12b1590
Refactor http/https server setup to be more transparant
marcofranssen Jun 30, 2023
8ee546c
Install the Go version as defined in go.mod
marcofranssen Jun 30, 2023
7bef037
Enable Go module caching to speed up builds
marcofranssen Jun 30, 2023
3f43905
Download modules in separate step
marcofranssen Jun 30, 2023
78cbc30
Download modules in separate step
marcofranssen Jun 30, 2023
eee1a91
Document Makefile and align PHONY with available tasks
marcofranssen Jun 27, 2023
205dbd7
Split building binaries and images into separate workflow steps
marcofranssen Jun 30, 2023
71e00cd
Document Makefile and align .PHONY with available tasks (#275)
mrsabath Jul 6, 2023
89fde99
Bump actions/setup-node from 3.6.0 to 3.7.0
dependabot[bot] Jul 6, 2023
1d82509
Implement HTTP/HTTPS including permanent redirect (#282)
mrsabath Jul 6, 2023
21504c7
Fix makefile reference
mrsabath Jul 6, 2023
b24c927
Fix makefile reference (#285)
mrsabath Jul 6, 2023
1b2b2c2
Bump actions/setup-node from 3.6.0 to 3.7.0 (#284)
mrsabath Jul 6, 2023
a9affa2
Fix HTTP config errors #268 (#287)
maia-iyer Jul 10, 2023
34b46b5
Fixed config format and TLS
maia-iyer Jul 12, 2023
600c7bb
Bump semver from 5.7.1 to 5.7.2 in /tornjak-frontend
dependabot[bot] Jul 12, 2023
5e23408
Fixed redirect
maia-iyer Jul 12, 2023
e3408e1
Added documentation
maia-iyer Jul 12, 2023
268cda7
Apply suggestions from code review
maia-iyer Jul 12, 2023
5ecc383
HTTP opens upon HTTPS failure to start
maia-iyer Jul 13, 2023
3e72200
Lint fix
maia-iyer Jul 13, 2023
33a7c9f
Fix HTTPS config and redirect #268 (#289)
mrsabath Jul 13, 2023
e3de186
Bump semver from 5.7.1 to 5.7.2 in /tornjak-frontend (#288)
mrsabath Jul 13, 2023
bc3c6df
Update the mTLS secret name (#290)
mrsabath Jul 17, 2023
1510c22
Remove unnecessary files (#291)
maia-iyer Jul 18, 2023
c6677f0
Change 'user' to 'client'
mrsabath Jul 19, 2023
089f27c
Merge branch 'v1.4' into naming-patch
mrsabath Jul 19, 2023
8c4658f
Bump word-wrap from 1.2.3 to 1.2.4 in /tornjak-frontend
dependabot[bot] Jul 20, 2023
9b3d750
Bump word-wrap from 1.2.3 to 1.2.4 in /tornjak-frontend (#293)
mrsabath Jul 21, 2023
8ebfa3b
Added x509/JWT svid field
maia-iyer Aug 1, 2023
4352e88
Fix quickstart Tornjak config
maia-iyer Aug 1, 2023
522c909
removed the old user files
mrsabath Aug 3, 2023
debd4be
Change 'user' to 'client' (#292)
mrsabath Aug 3, 2023
327cb0b
Added x509/JWT svid field to frontend Create entry page #236 (#294)
mrsabath Aug 3, 2023
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
14 changes: 14 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "github-actions"
# Workflow files stored in the
# default location of `.github/workflows`
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 5
52 changes: 38 additions & 14 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,47 @@ jobs:
tornjak-build:
runs-on: ubuntu-latest
steps:
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
- name: Show trigger info
run: |
cat <<EOF >>"${GITHUB_STEP_SUMMARY}"
# Workflow job info

- 🎉 The job was automatically triggered by a ${{ github.event_name }} event.
- 🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!
- 🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}.
EOF

- name: Check out repository code
uses: actions/checkout@v2
uses: actions/checkout@v3.5.3

- name: Install Golang
uses: actions/setup-go@v3
uses: actions/setup-go@v4.0.1
with:
go-version: '1.17'
- uses: actions/setup-node@v2
go-version-file: go.mod
check-latest: true
cache: true

- uses: actions/setup-node@v3.7.0
with:
node-version: '15'
node-version: '18'

- name: Download modules
run: go mod download

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v3.6.0
with:
version: v1.29
args: --timeout 5m
- name: Run make all
run: make all
- run: echo "🍏 This job's status is ${{ job.status }}."
version: v1.53
args: --timeout 7m

- name: Build binaries
run: make binaries

- name: Build images
run: make images

- name: Print job result
run: |
cat <<EOF >>"${GITHUB_STEP_SUMMARY}"
- 🍏 This job's status is ${{ job.status }}.
EOF
63 changes: 45 additions & 18 deletions .github/workflows/master-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,49 @@ on:
push:
branches:
- main
- v1.2
- v1.3
- v1.4
jobs:
tornjak-build:
runs-on: ubuntu-latest
steps:
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
- name: Show trigger info
run: |
cat <<EOF >>"${GITHUB_STEP_SUMMARY}"
# Workflow job info

- 🎉 The job was automatically triggered by a ${{ github.event_name }} event.
- 🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!
- 🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}.
EOF

- name: Check out repository code
uses: actions/checkout@v2
uses: actions/checkout@v3.5.3

- name: Install Golang
uses: actions/setup-go@v3
uses: actions/setup-go@v4.0.1
with:
go-version: '1.17'
- uses: actions/setup-node@v3
go-version-file: go.mod
check-latest: true
cache: true

- name: Download modules
run: go mod download

- uses: actions/setup-node@v3.7.0
with:
node-version: '18'

- name: Download modules
run: go mod download

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v3.6.0
with:
version: v1.29
args: --timeout 5m
version: v1.53
args: --timeout 7m

- name: Log in to GHCR.io
uses: docker/login-action@v1
uses: docker/login-action@v2.2.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
Expand All @@ -36,16 +54,25 @@ jobs:
# set repo and GITHUB SHA
- name: Set github commit id
run: echo "GITHUB_SHA=$GITHUB_SHA" >> $GITHUB_ENV

- name: Set release repo
run: echo "REPO=ghcr.io/${{ github.repository_owner }}" >> $GITHUB_ENV

# build and push images tagged with GITHUB_SHA, version, and latest
- name: Build and push tornjak backend image
run: make container-backend-push
run: make release-tornjak-backend

- name: Build and push tornjak frontend image
run: make container-frontend-push
run: make release-tornjak-frontend

- name: Build and push tornjak image (frontend+backend)
run: make container-tornjak-push
run: make release-tornjak

- name: Build and push tornjak manager image
run: make container-manager-push
- run: echo "🍏 This job's status is ${{ job.status }}."
run: make release-tornjak-manager

- name: Print job result
run: |
cat <<EOF >>"${GITHUB_STEP_SUMMARY}"
- 🍏 This job's status is ${{ job.status }}.
EOF
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ Building Tornjak manually can be done with the Makefile. Notable make targets fo
- `make bin/tornjak-backend`: makes the Go executable of the Tornjak backend
- `make bin/tornjak-manager`: makes the Go executable of the Tornjak manager
- `make frontend-local-build`: makes the optimized ReactJS app locally for the Tornjak frontend. Uses environment variable configuration as in tornjak-frontend/.env
- `make container-backend`: containerizes Go executable of the Tornjak backend
- `make container-manager`:containerizes Go executable of the Tornjak manager
- `make container-frontend`: containerizes React JS app for the Tornjak frontend
- `make container-tornjak`: containerizes Tornjak backend with Tornjak frontend
- `make image-tornjak-backend`: containerizes Go executable of the Tornjak backend
- `make image-tornjak-manager`:containerizes Go executable of the Tornjak manager
- `make image-tornjak-frontend`: containerizes React JS app for the Tornjak frontend
- `make image-tornjak`: containerizes Tornjak backend with Tornjak frontend

For usage instructions of the containers, please see our [USAGE document](./USAGE.md) to get started.

Expand Down
17 changes: 0 additions & 17 deletions Dockerfile.add-backend

This file was deleted.

4 changes: 2 additions & 2 deletions Dockerfile.frontend-container
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
## Build stage
FROM node:16-alpine3.14 AS build
FROM node:18-alpine3.14 AS build
WORKDIR /usr/src/app
COPY tornjak-frontend .
RUN npm install && \
npm run build

## Runtime stage
FROM node:16-alpine3.14 AS runtime
FROM node:18-alpine3.14 AS runtime
WORKDIR /usr/src/app
COPY --from=build /usr/src/app/build ./build
COPY --from=build /usr/src/app/.env.prod .
Expand Down
Loading