Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Simox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Florian Leander Singer
Simox
Commits
573e49e7
Commit
573e49e7
authored
1 year ago
by
Rainer Kartmann
Browse files
Options
Downloads
Patches
Plain Diff
Add docker workspace config, dockerignore build/, upgrade to dockerfile
parent
58f3531c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.dockerignore
+1
-0
1 addition, 0 deletions
.dockerignore
docker/armarx-workspace.json
+15
-0
15 additions, 0 deletions
docker/armarx-workspace.json
docker/bionic
+16
-1
16 additions, 1 deletion
docker/bionic
with
32 additions
and
1 deletion
.dockerignore
0 → 100644
+
1
−
0
View file @
573e49e7
build/
This diff is collapsed.
Click to expand it.
docker/armarx-workspace.json
0 → 100644
+
15
−
0
View file @
573e49e7
{
"modules"
:
{
"deps/doxygen"
:
{},
"simox"
:
{}
},
"global"
:
{
"prepare"
:
{
"cmake"
:
{
"definitions"
:
{
"CMAKE_BUILD_TYPE"
:
"RelWithDebInfo"
}
}
}
}
}
This diff is collapsed.
Click to expand it.
docker/bionic
+
16
−
1
View file @
573e49e7
...
...
@@ -7,5 +7,20 @@ ENV LANG C.UTF-8
ENV DEBIAN_FRONTEND noninteractive
ENV TZ Europe/Berlin
# Setup workspace in Docker.
RUN axii workspace create /workspace workspace
RUN axii workspace activate workspace
# Simulate activating the workspace.
ENV ARMARX_WORKSPACE=/workspace
# Setup repo in Docker.
RUN axii workspace create ~/workspace workspace
WORKDIR $ARMARX_WORKSPACE/simox
COPY . .
# Use workspace config.
COPY docker/armarx-workspace.json $ARMARX_WORKSPACE/armarx-workspace.json
# Run the upgrade.
RUN axii workspace system --accept-apt-install
RUN axii workspace upgrade
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