Skip to content
Snippets Groups Projects
Commit cd9116f2 authored by cyril.cros's avatar cyril.cros
Browse files

Finish touching up the new Dockerfile with jq

Debug

Try with the right entrypoint

Attempt at fixing

Attempt at fixin #2

Attempt at fixin #3

Attempt at fixin #4

Attempt at fixin #4

Attempt at fixin #5

Attempt at fixin #7

Attempt at fixin #8
parent b5ca31f5
No related branches found
No related tags found
No related merge requests found
Pipeline #65548 passed
...@@ -37,7 +37,6 @@ build_nginx_with_jbrowse_config_file: ...@@ -37,7 +37,6 @@ build_nginx_with_jbrowse_config_file:
stage: build stage: build
image: image:
name: gcr.io/kaniko-project/executor:v1.23.2-debug name: gcr.io/kaniko-project/executor:v1.23.2-debug
entrypoint: [""]
before_script: before_script:
# yamllint disable-line rule:line-length # yamllint disable-line rule:line-length
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
......
# Stage 1: Jbrowse config file generated # Stage 0: Get jq
FROM quay.io/biocontainers/jbrowse2:2.15.3--hbbc3ce4_0 as jbrowse_base FROM ghcr.io/jqlang/jq:1.7.1 as jq
WORKDIR /app
COPY jbrowse_script_base.sh .
RUN ./jbrowse_script_base.sh \
&& rm jbrowse_script_base.sh
RUN rm -rf annelids/node_modules
# Stage 2: Json processing # Stage 1: Jbrowse config file generated
FROM ghcr.io/jqlang/jq:1.7.1 as jbrowse_builder FROM quay.io/biocontainers/jbrowse2:2.15.3--hbbc3ce4_0 as jbrowse_builder
WORKDIR /app/annelids WORKDIR /app/annelids
COPY --from=jbrowse_base /app/annelids/ /app/annelids/ COPY jbrowse_script_base.sh default_session.json tracks.json ./
COPY default_session.json tracks.json ./ COPY --from=jq /jq ./
RUN --argfile base default_session.json '.defaultSession = $base' < config.json > config.json RUN ./jbrowse_script_base.sh \
# | jq --argfile base tracks.json '. += $base' > config.json \ && ./jq --rawfile base default_session.json '.defaultSession = $base' < config.json \
# && rm default_session.json tracks.json | ./jq --rawfile base tracks.json '. += $base' > config.json \
&& rm -rf node_modules jq jbrowse_script_base.sh default_session.json tracks.json
# Stage 3: Load into nginx # Stage 2: Load into nginx
FROM nginx:alpine FROM nginx:alpine
WORKDIR /usr/share/nginx/html WORKDIR /usr/share/nginx/html
RUN rm -rf ./* RUN rm -rf ./*
......
#!/bin/bash -eux #!/bin/bash -eux
# Platy only for now # Platy only for now
jbrowse create annelids jbrowse create -f .
cd annelids
# Assemblies # Assemblies
jbrowse add-assembly https://s3.embl.de/annelids/pdumv021/pdumv021.fa.gz -n "pdumv021" --displayName "Platynereis dumerilii genome v2.1 (pdumv021)" --gziLocation https://s3.embl.de/annelids/pdumv021/pdumv021.fa.gz.gzi --faiLocation https://s3.embl.de/annelids/pdumv021/pdumv021.fa.gz.fai -t bgzipFasta jbrowse add-assembly https://s3.embl.de/annelids/pdumv021/pdumv021.fa.gz -n "pdumv021" --displayName "Platynereis dumerilii genome v2.1 (pdumv021)" --gziLocation https://s3.embl.de/annelids/pdumv021/pdumv021.fa.gz.gzi --faiLocation https://s3.embl.de/annelids/pdumv021/pdumv021.fa.gz.fai -t bgzipFasta
jbrowse add-assembly https://s3.embl.de/annelids/pmassv1_masked/pmassv1_masked.fa.gz -n "pmassv1_masked" --displayName "Platynereis massiliensis genome v1 - masked (pmassv1)" --gziLocation https://s3.embl.de/annelids/pmassv1_masked/pmassv1_masked.fa.gz.gzi --faiLocation https://s3.embl.de/annelids/pmassv1_masked/pmassv1_masked.fa.gz.fai -t bgzipFasta jbrowse add-assembly https://s3.embl.de/annelids/pmassv1_masked/pmassv1_masked.fa.gz -n "pmassv1_masked" --displayName "Platynereis massiliensis genome v1 - masked (pmassv1)" --gziLocation https://s3.embl.de/annelids/pmassv1_masked/pmassv1_masked.fa.gz.gzi --faiLocation https://s3.embl.de/annelids/pmassv1_masked/pmassv1_masked.fa.gz.fai -t bgzipFasta
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment