Commit 830dff00 authored by BRUVRY-LAGADEC's avatar BRUVRY-LAGADEC 💻
Browse files

Merge branch 'feature/imagine' of...

Merge branch 'feature/imagine' of https://gitlab.ifremer.fr/sih-public/sumaris/sumaris-pod into feature/imagine
parents 2102b47a 441d947c
......@@ -266,8 +266,9 @@ gitlab-release:
- ls -l target/docker/config
- cd target/docker
# Build docker image
- docker pull ${CI_REGISTRY_IMAGE}:${IMAGE_TAG} || true
- docker build --cache-from ${CI_REGISTRY_IMAGE}:${IMAGE_TAG} --pull -t ${CI_REGISTRY_IMAGE}:${IMAGE_TAG} --build-arg="USERID=${IMAGE_USERID}" --build-arg="GROUPID=${IMAGE_GROUPID}" .
#- docker pull ${CI_REGISTRY_IMAGE}:${IMAGE_TAG} || true
#- docker build --cache-from ${CI_REGISTRY_IMAGE}:${IMAGE_TAG} --pull -t ${CI_REGISTRY_IMAGE}:${IMAGE_TAG} --build-arg="USERID=${IMAGE_USERID}" --build-arg="GROUPID=${IMAGE_GROUPID}" .
- docker build --no-cache -t ${CI_REGISTRY_IMAGE}:${IMAGE_TAG} --build-arg="USERID=${IMAGE_USERID}" --build-arg="GROUPID=${IMAGE_GROUPID}" .
- docker push ${CI_REGISTRY_IMAGE}:${IMAGE_TAG}
artifacts:
paths:
......@@ -285,6 +286,8 @@ docker:imagine:
extends: .docker-build
variables:
IMAGE_TAG: 'imagine'
IMAGE_USERID: 25484
IMAGE_GROUPID: 10004
only:
- feature/imagine
......
......@@ -891,6 +891,7 @@
<PARAMETER ID="351" LABEL="MATURITY_STAGE_9_VISUAL" NAME="Maturité sexuelle à 4 plus 2 stades" IS_BOOLEAN="0" IS_QUALITATIVE="1" IS_ALPHANUMERIC="0" STATUS_FK="1" CREATION_DATE="2018-03-08" UPDATE_DATE="2018-03-08"/>
<!--<PARAMETER ID="352" LABEL="MORSE_CODE" NAME="Code Morse" IS_QUALITATIVE="0" IS_ALPHANUMERIC="1" STATUS_FK="1" CREATION_DATE="2018-03-08" UPDATE_DATE="2018-03-08"/>-->
<PARAMETER ID="353" LABEL="STRATEGY_LABEL" NAME="Stratégie" IS_QUALITATIVE="0" IS_ALPHANUMERIC="1" STATUS_FK="1" CREATION_DATE="2018-03-08" UPDATE_DATE="2018-03-08"/>
<PARAMETER ID="1435" LABEL="SAMPLE_ID" NAME="Code du prélèvement" IS_QUALITATIVE="0" IS_ALPHANUMERIC="1" STATUS_FK="1" CREATION_DATE="2018-03-08" UPDATE_DATE="2018-03-08"/>
<!-- QV / Trawl type-->
<QUALITATIVE_VALUE ID="1" PARAMETER_FK="8" LABEL="IRL" NAME="Irish" STATUS_FK="1" CREATION_DATE="2018-03-08" UPDATE_DATE="2018-03-08"/>
......@@ -1471,6 +1472,7 @@
<PMFM ID="357" PARAMETER_FK="91" LABEL="WEIGHT_ESTIMATED_TOTAL_KG" MATRIX_FK="2" FRACTION_FK="1" METHOD_FK="3" MIN_VALUE="0" MAXIMUM_NUMBER_DECIMALS="2" UNIT_FK="3" STATUS_FK="1" CREATION_DATE="2018-03-08" UPDATE_DATE="2018-03-08"/>
<!--<PMFM ID="358" PARAMETER_FK="352" LABEL="MORSE_CODE" UNIT_FK="0" STATUS_FK="1" CREATION_DATE="2018-03-08" UPDATE_DATE="2018-03-08"/>-->
<PMFM ID="359" PARAMETER_FK="353" LABEL="STRATEGY_LABEL" UNIT_FK="0" STATUS_FK="1" CREATION_DATE="2018-03-08" UPDATE_DATE="2018-03-08"/>
<PMFM ID="1435" PARAMETER_FK="1435" LABEL="SAMPLE_ID" UNIT_FK="0" STATUS_FK="1" CREATION_DATE="2018-03-08" UPDATE_DATE="2018-03-08"/>
<!-- Round weight conversion -->
<ROUND_WEIGHT_CONVERSION ID="1" TAXON_GROUP_FK="1122" CONVERSION_COEFFICIENT="3.95" START_DATE="2010-01-01 00:00:00.000000" LOCATION_FK="1" DRESSING_FK="351" PRESERVING_FK="332" STATUS_FK="1" CREATION_DATE="2018-03-08" UPDATE_DATE="2018-03-08"/>
......@@ -1644,4 +1646,4 @@
<P01_RDB_SPECIES_LIST/>
<P01_RDB_LANDING/>
</dataset>
\ No newline at end of file
</dataset>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment