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.

Sign up for GitHub

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

Jump to bottom

Compare Master and developp #119

Merged
merged 195 commits into from
Jan 20, 2022
Merged

Compare Master and developp #119

merged 195 commits into from
Jan 20, 2022

Conversation

pierrejego
Copy link
Contributor

Draft to compare master and develop

Rémi Desgrange and others added 30 commits March 13, 2020 11:50
first commit of the new flask backend
737e80a
first try adding the backend
4387e7b
add test and add Docker file and composition
42ba0d7
Add test
da0d28a
change directory structure to match comments
58b9d56
Ability to have an anonymous user
e6a0037
minor change to be compliant with remark on the PR
13e7ba6
Make the docker build process and launch more configurable
db12d7d
Add github actions
3a3b7f8 
Also change images org to geobretagne, since mviewer org doesn't exist
in docker hub.
feat mviewerstudio: use harmonised user_info structure
55b7566
@pmauduit
reworked the docker building logic
de86454 
* using flask to serve the static files
* removing the frontend part
* simplifying the docker composition
docs: document the URL params
f34d4a4
feat: better log messages
4553e04
feat: disable options that mviewerstudio does not know how to handle
8e0957a
docs: use some capital letters in geojson
f42aa3b
feat: draw attention to GeoServer specificities
38ca4f1
Merge pull request #64 from neogeo-technologies/better-log-messages
1b28cf5 
Better log messages
Merge pull request #65 from neogeo-technologies/disable-unused-options
bc00367 
Disable unused options
Merge pull request #66 from neogeo-technologies/geoserver-specificities
34c50e1 
Draw attention to GeoServer specificities
@pmauduit
docker - adding a php backend, move config to apps/
d322492
@pmauduit
dockerization - reoordering things
27e9536 
* Using the docker subdirectory to store docker-specific files
 (dockerfiles, configurations, ...)
* In case of python backend, the config.json is only used client side,
  as the configuration is done via environment variables on the backend.
  Keeping the docker version of the config in the static/ files provided
  by the backend as symlink.
@pmauduit
docker - adding a nginx to hit studio & mviewer
eb1c7b8 
PHP backend is working in the docker-compo, still need to
debug the python backend.
@pmauduit
relocating services
63a6a17 
* python services behind 'srv/'
* make the services url for list/delete configurable
feat: add snapshot to the version string in the develop branch
b50df2f
@pmauduit
python - fixing backend
8a6ffcb
@pmauduit
docker - aliasing both backends to be reachable under 'mviewerstudio'…
573d9ff 
… host

* Same ports convention for php & python backends (same listening port)
@pmauduit
updating doc
c1d9704
@pmauduit
python backend - fixing utests
6ad54ad 
also fixing doc
@pmauduit
gh actions - rewip workflow file
ba47e4e
Add spec to use external topics #19
d660b18
Rémi Desgrange and others added 5 commits June 17, 2021 09:31
Fix CI build
1216b14 
Add types packages in dev-requirements.txt to make `mypy` happy.
@bchartier
Merge pull request #117 from camptocamp/fix-ci-mypy
0b3c04c 
Fix CI build
Fixing CI by adding magical env var
ea40c18 
Following this issue, moby/moby#37965 adding
DOCKER_BUILDKIT env var make the build working.
@bchartier
Merge pull request #118 from camptocamp/fix-ci
e54f3ea 
Fixing CI by adding magical env var
@bchartier
Merge pull request #114 from bchartier/fix_apps_list
92c93a7 
Fix apps list
@pierrejego pierrejego changed the title Draft to compare Compare Master and developp Dec 22, 2021
@pierrejego
Copy link
Contributor Author

Seul le config-sample.json est en conflit.
Aucun soucis pour merger et faire une release.

@pierrejego pierrejego added this to the 3.2 milestone Dec 22, 2021
@pierrejego
Copy link
Contributor Author

link to #112

@bchartier
Copy link
Contributor

Seul le config-sample.json est en conflit.
Aucun soucis pour merger et faire une release.

A priori il n'y a rien à faire pour le fichier config-sample.json : la version de la branche develop a l'air très bien. Si ?

@bchartier
Copy link
Contributor

Seul le config-sample.json est en conflit.
Aucun soucis pour merger et faire une release.

A priori il n'y a rien à faire pour le fichier config-sample.json : la version de la branche develop a l'air très bien. Si ?

J'ai résolu le conflit sur config-sample.json.

bchartier
bchartier reviewed Dec 29, 2021
View reviewed changes
Copy link
Contributor

@bchartier bchartier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

J'ai rapidement testé cette PR avec un docker compose.
Je n'ai pas repéré d'anomalie.
J'ai noté une erreur lors de l'exécution des tests unitaires sur le backend Python (dans les Github actions).

@spelhate
Copy link
Collaborator

spelhate commented Jan 19, 2022 •
edited
Loading

Les images docker sont maintenant générées sans erreurs et poussées sur hub docker.
De mon point de vue, on peut merger develop dans master une fois la PR testée.

@spelhate spelhate marked this pull request as ready for review January 19, 2022 16:42
@spelhate spelhate mentioned this pull request Jan 20, 2022
Open
@spelhate spelhate merged commit 9824f25 into master Jan 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bchartier bchartier bchartier left review comments

@spelhate spelhate spelhate approved these changes

@Agath21 Agath21 Awaiting requested review from Agath21

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.2
Development

Successfully merging this pull request may close these issues.
9 participants
@pierrejego @bchartier @spelhate @pmauduit @jeanpommier @tkohr @lvinsonneau @lecault @Gaetanbrl