...
 
Commits (4)
......@@ -9,9 +9,3 @@ variables:
PORT: 3000
VALUES_FILE: ./.k8s/app.values.yml # Your values
DOCKER_BUILD_ARGS: "--no-cache"
GIT_SUBMODULE_STRATEGY: none
Register image:
extends: .autodevops_register_image
variables:
GIT_SUBMODULE_STRATEGY: normal
[submodule "socialgouv/legi-data"]
branch = master
path = .submodules/socialgouv/legi-data
url = https://github.com/socialgouv/legi-data
[submodule "socialgouv/fiches-vdd"]
branch = master
path = .submodules/socialgouv/fiches-vdd
url = https://github.com/socialgouv/fiches-vdd
[submodule "socialgouv/kali-data"]
branch = master
path = .submodules/socialgouv/kali-data
url = https://github.com/socialgouv/kali-data
Subproject commit 1788bd43b9db88da1ddc534d16436fd8e12950eb
Subproject commit e8ea123435f45230c5c4c8cbadc46fccf123c95d
Subproject commit 4e6156773e329a4e275adaf18e7ebd608faa8201
FROM node:13-alpine
RUN apk add --update --no-cache git=~2
RUN apk add git
WORKDIR /app
COPY package.json yarn.lock /app/
COPY packages/frontend/package.json /app/packages/frontend/package.json
COPY packages/git/package.json /app/packages/git/package.json
COPY clone.sh .
# renovate: datasource=git-refs depName=socialgouv/legi-data
ARG LEGI_DATA_VERSION=1c4dbc6d9ebcb6481cf7f97c7d4535befbd26861
# renovate: datasource=git-refs depName=socialgouv/kali-data
ARG KALI_DATA_VERSION=557ce6d41cf86af1543b65d177fc57fc2a6a5821
# renovate: datasource=git-refs depName=socialgouv/fiches-vdd
ARG FICHES_VDD_VERSION=cad3f439d726d735e1579f065f59121582190628
RUN ./clone.sh
COPY package.json .
COPY yarn.lock .
COPY packages/frontend/package.json ./packages/frontend/package.json
COPY packages/git/package.json ./packages/git/package.json
RUN yarn
COPY packages /app/packages
COPY .submodules /app/.submodules
COPY packages ./packages
RUN yarn prerender
......
......@@ -11,7 +11,7 @@ API + UI pour reporter les changements de contenus sur des repos GIT.
## Dev
Ensure that you have the data submodules (in .submodules)
Utiliser [clone.sh](./clone.sh) pour récupérer les repos dans `/tmp/clones`.
```
yarn
......@@ -26,15 +26,6 @@ Actuellement les repos GIT sont récupérés via le `Dockerfile`, donc mis à jo
- [kali-data](https://github.com/SocialGouv/kali-data)
- [fiches-vdd](https://github.com/SocialGouv/fiches-vdd)
Add a data submodule with
```
$ git submodule add --depth 1 --name <repo> https://github.com/<user>/<repo> ./.submodules/<user>/<repo>
# Example
$ git submodule add --depth 1 --name socialgouv/legi-data https://github.com/socialgouv/legi-data ./.submodules/socialgouv/legi-data
$ git submodule add --depth 1 --name socialgouv/kali-data https://github.com/socialgouv/kali-data ./.submodules/socialgouv/kali-data
$ git submodule add --depth 1 --name socialgouv/fiches-vdd https://github.com/socialgouv/fiches-vdd ./.submodules/socialgouv/fiches-vdd
```
# Todo :
- continuous deployment with @renovate + @socialgouv
......
#!/bin/sh
GIT_STORAGE=/tmp/clones
mkdir -p $GIT_STORAGE || true
git clone https://github.com/SocialGouv/legi-data $GIT_STORAGE/socialgouv/legi-data || (cd $GIT_STORAGE/socialgouv/legi-data && git pull)
cd $GIT_STORAGE/socialgouv/legi-data && echo "legi-data : `git log --pretty=format:'%H' -n 1`"
git clone https://github.com/SocialGouv/kali-data $GIT_STORAGE/socialgouv/kali-data || (cd $GIT_STORAGE/socialgouv/kali-data && git pull)
cd $GIT_STORAGE/socialgouv/kali-data && echo "kali-data : `git log --pretty=format:'%H' -n 1`"
git clone https://github.com/SocialGouv/fiches-vdd $GIT_STORAGE/socialgouv/fiches-vdd || (cd $GIT_STORAGE/socialgouv/fiches-vdd && git pull)
cd $GIT_STORAGE/socialgouv/fiches-vdd && echo "fiches-vdd : `git log --pretty=format:'%H' -n 1`"
\ No newline at end of file
......@@ -6,7 +6,7 @@
"dependencies": {
"@socialgouv/fiches-vdd": "^1.26.0",
"classnames": "^2.2.6",
"diff": "1.2",
"diff": "3.5",
"html-text": "^1.0.1",
"isomorphic-unfetch": "^3.0.0",
"memoizee": "^0.4.14",
......@@ -41,7 +41,7 @@
"devDependencies": {
"@socialgouv/eslint-config-react": "0.20.0",
"@socialgouv/eslint-config-recommended": "0.20.0",
"eslint": "6.8.0",
"eslint": "7.1.0",
"prettier": "2.0.4"
}
}
......@@ -4,7 +4,7 @@ import memoizee from "memoizee";
import { compareArticles } from "./compareArticles";
const GIT_STORAGE = process.env.GIT_STORAGE || "../../.submodules";
const GIT_STORAGE = "/tmp/clones";
// todo: ensure the diff is useful, exclude html/format changes
const compareLegiArticles = (tree1, tree2) =>
......
This diff is collapsed.