Skip to content

Commit

Permalink
Merge pull request #54 from joshniemela/cicd
Browse files Browse the repository at this point in the history
Cicd
  • Loading branch information
joshniemela authored Aug 18, 2024
2 parents ee50f44 + a1cdff9 commit c5cb159
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 8 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/docker-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Docker CI

on:
push:
paths:
- ".github/workflows/docker-ci.yml"
pull_request:
branches:
- main

jobs:
docker:
name: Docker compose up
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Docker compose up
run: docker compose up -d
2 changes: 1 addition & 1 deletion .github/workflows/frontend-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18, 20]
node-version: [18, 20, 22]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:latest AS build
FROM node:22.6.0-alpine3.19 AS build

WORKDIR /app

Expand Down
7 changes: 1 addition & 6 deletions frontend/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
/** @type {import('tailwindcss').Config} */
import flowbite from "flowbite/plugin";
export default {
content: [
"./src/**/*.{html,js,svelte,ts}",
"./node_modules/flowbite-svelte/**/*.{html,js,svelte,ts}",
],
content: ["./src/**/*.{html,js,svelte,ts}"],
theme: {
extend: {
spacing: {
Expand Down Expand Up @@ -95,5 +91,4 @@ export default {
fadeIn: "fadeIn 0.5s ease-in-out",
},
},
plugins: [flowbite],
};

0 comments on commit c5cb159

Please sign in to comment.