Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tango
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
tango
Commits
928ba74a
Commit
928ba74a
authored
3 years ago
by
Stefano Di Frischia
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into
L2SS-747
-fix-master
parents
747179b4
c807b7e5
No related branches found
No related tags found
1 merge request
!303
L2SS-747: Fix integration tests
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bin/start-ds.sh
+1
-1
1 addition, 1 deletion
bin/start-ds.sh
docker-compose/jupyter/Dockerfile
+2
-3
2 additions, 3 deletions
docker-compose/jupyter/Dockerfile
with
3 additions
and
4 deletions
bin/start-ds.sh
+
1
−
1
View file @
928ba74a
...
@@ -35,7 +35,7 @@ else
...
@@ -35,7 +35,7 @@ else
mkdir
-p
/tmp/tangostationcontrol
mkdir
-p
/tmp/tangostationcontrol
python3 setup.py build
--build-base
/tmp/tangostationcontrol egg_info
--egg-base
/tmp/tangostationcontrol bdist_wheel
--dist-dir
/tmp/tangostationcontrol
||
exit
1
python3 setup.py build
--build-base
/tmp/tangostationcontrol egg_info
--egg-base
/tmp/tangostationcontrol bdist_wheel
--dist-dir
/tmp/tangostationcontrol
||
exit
1
# shellcheck disable=SC2012
# shellcheck disable=SC2012
sudo
pip
install
"
$(
ls
-Art
/tmp/tangostationcontrol/
*
.whl |
tail
-n
1
)
"
pip
install
"
$(
ls
-Art
/tmp/tangostationcontrol/
*
.whl |
tail
-n
1
)
"
fi
fi
# Return to the stored the directory, this preserves the working_dir argument in
# Return to the stored the directory, this preserves the working_dir argument in
...
...
This diff is collapsed.
Click to expand it.
docker-compose/jupyter/Dockerfile
+
2
−
3
View file @
928ba74a
...
@@ -5,9 +5,8 @@ FROM ${SOURCE_IMAGE}
...
@@ -5,9 +5,8 @@ FROM ${SOURCE_IMAGE}
# that are needed for temporary storage the proper owner and access rights.
# that are needed for temporary storage the proper owner and access rights.
ARG
CONTAINER_EXECUTION_UID=1000
ARG
CONTAINER_EXECUTION_UID=1000
# Create homedir
# Create new user with uid but only if uid not used
ENV
HOME=/home/user
RUN
sudo
adduser
--disabled-password
--system
--uid
${
CONTAINER_EXECUTION_UID
}
--no-create-home
--home
${
HOME
}
user
||
exit
0
RUN
sudo mkdir
-p
${
HOME
}
RUN
sudo chown
${
CONTAINER_EXECUTION_UID
}
-R
${
HOME
}
RUN
sudo chown
${
CONTAINER_EXECUTION_UID
}
-R
${
HOME
}
COPY
requirements.txt ./
COPY
requirements.txt ./
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment