Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Amine GHOZLANE
shaman
Commits
c51d126a
Commit
c51d126a
authored
Oct 28, 2020
by
Amine GHOZLANE
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update conda and docker install, better load .fq files
parent
02e7b2e0
Pipeline
#40394
passed with stages
in 124 minutes and 1 second
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
.gitlab-ci.yml
.gitlab-ci.yml
+6
-3
ui.R
ui.R
+1
-1
No files found.
.gitlab-ci.yml
View file @
c51d126a
...
...
@@ -5,19 +5,20 @@ stages:
services
:
-
docker:dind
-
registry-gitlab.pasteur.fr/dsi-tools/docker-images/
docker:dind
variables
:
DOCKER_HOST
:
tcp://localhost:2375
build_dev
:
image
:
docker:latest
image
:
registry-gitlab.pasteur.fr/dsi-tools/docker-images/
docker:latest
stage
:
build_dev
variables
:
CI_DEBUG_TRACE
:
"
false"
script
:
-
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
# - docker pull aghozlane/shaman:latest || true
-
docker build
--tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
.
...
...
@@ -27,12 +28,13 @@ build_dev:
-
master
build_master
:
image
:
docker:latest
image
:
registry-gitlab.pasteur.fr/dsi-tools/docker-images/
docker:latest
stage
:
build_master
variables
:
CI_DEBUG_TRACE
:
"
false"
script
:
-
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
# - docker pull aghozlane/shaman:latest || true
-
docker build -t aghozlane/shaman .
-
docker push aghozlane/shaman
only
:
...
...
@@ -51,6 +53,7 @@ build_conda:
-
conda config --add channels r
-
conda config --add channels aghozlane
-
conda config --set anaconda_upload yes
-
conda update conda
-
conda install -y conda-verify
-
conda install -y anaconda-client
-
conda install -y conda-build
...
...
ui.R
View file @
c51d126a
...
...
@@ -415,7 +415,7 @@ function(request) {
# br(),
column
(
width
=
12
,
fileInput
(
"dir"
,
label
=
'Select your fastq files'
,
accept
=
c
(
".fastq,.fastq.gz,.f
gz,
.gz"
),
multiple
=
TRUE
),
fileInput
(
"dir"
,
label
=
'Select your fastq files'
,
accept
=
c
(
".fastq,.fastq.gz,.f
q,.fq
.gz"
),
multiple
=
TRUE
),
# shinyDirButton("dir", "Select a directory", "Upload",buttonType = "primary")
# tags$input(id = "dir2", webkitdirectory = TRUE, type = "file", onchange="pressed()"),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment