Skip to content

Commit

Permalink
Refactor project name in pyproject.toml
Browse files Browse the repository at this point in the history
  • Loading branch information
emmanuelmathot committed Oct 16, 2024
1 parent 4b1e6f3 commit 11a205a
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- '*'
paths:
# Only run test and docker publish if some code have changed
- 'deployment/k8s/charts/**'
- 'deployment/helm/**'
- '.github/workflows/check_charts.yaml'
pull_request:

Expand All @@ -25,7 +25,7 @@ jobs:
- name: Check Version
run: |
current_version=$(grep '^version=' pyproject.toml | cut -f2 -d= | tr -d ' ' | tr -d '"')
app_version=$(grep 'appVersion:' deployment/k8s/charts/Chart.yaml | cut -f2 -d: | tr -d ' ')
app_version=$(grep 'appVersion:' deployment/helm/Chart.yaml | cut -f2 -d: | tr -d ' ' | tr -d '"')
if [[ "$current_version" != "$app_version" ]]; then
echo "❌ current version from pyproject.toml ($current_version) and appVersion from Chart.yaml ($app_version) differs";
exit 1;
Expand All @@ -46,21 +46,21 @@ jobs:
- name: Run chart-testing (list-changed)
id: list-changed
run: |
changed=$(ct list-changed --chart-dirs deployment/k8s --target-branch ${{ github.event.repository.default_branch }})
changed=$(ct list-changed --chart-dirs deployment --target-branch ${{ github.event.repository.default_branch }})
if [[ -n "$changed" ]]; then
echo "::set-output name=changed::true"
fi
- name: Run chart-testing (lint)
run: ct lint --chart-dirs deployment/k8s --target-branch ${{ github.event.repository.default_branch }}
run: ct lint --chart-dirs deployment --target-branch ${{ github.event.repository.default_branch }}

- name: Build container
uses: docker/build-push-action@v6
if: steps.list-changed.outputs.changed == 'true'
with:
platforms: linux/amd64
context: .
file: dockerfiles/Dockerfile
file: webapp/Dockerfile
push: false
tags: "polder:dev"

Expand Down
6 changes: 6 additions & 0 deletions deployment/helm/Chart.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dependencies:
- name: eoapi
repository: https://devseed.com/eoapi-k8s/
version: 0.4.17
digest: sha256:adbb8a0db399bf32efbf12ffafafbf07c6d4f676f78b2bf2aa6befdc5f1a4f51
generated: "2024-10-16T11:33:15.655622351+02:00"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[project]
name = "titiler"
name = "polder"
description = "A simple web service to create maps and viewer using eoAPI"
readme = "README.md"
requires-python = ">=3.8"
Expand Down
16 changes: 10 additions & 6 deletions webapp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
FROM node:alpine
WORKDIR /app
FROM node:20-alpine as build
WORKDIR /src
RUN corepack enable && corepack prepare yarn@stable --activate
COPY package.json /app
RUN yarn install
COPY . /app
CMD ["yarn", "run", "start"]
COPY . .
RUN yarn install
RUN yarn build
RUN ls -la .

FROM nginx:alpine
COPY --from=build /src/dist /usr/share/nginx/html
EXPOSE 8080
3 changes: 2 additions & 1 deletion webapp/app/components/common/stressed-input.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import { Input, InputProps, keyframes } from '@chakra-ui/react';
import { Input, InputProps } from '@chakra-ui/react';
import { keyframes } from '@emotion/react';

import {
StressedField,
Expand Down

0 comments on commit 11a205a

Please sign in to comment.