Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cppack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
passwords
cppack
Commits
2511d7c4
You need to sign in or sign up before continuing.
Commit
2511d7c4
authored
Jan 16, 2020
by
Mathieu Valois
Browse files
Options
Downloads
Patches
Plain Diff
fix Dockerfile
parent
9d2a9c7d
No related branches found
No related tags found
No related merge requests found
Pipeline
#6120
passed
Jan 16, 2020
Stage: test
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
Dockerfile
+3
-2
3 additions, 2 deletions
Dockerfile
with
5 additions
and
4 deletions
CMakeLists.txt
+
2
−
2
View file @
2511d7c4
...
...
@@ -13,7 +13,7 @@ set(EXECUTABLE_OUTPUT_PATH bin/${CMAKE_BUILD_TYPE})
set
(
CMAKE_CXX_FLAGS
"-pedantic -Wall -std=c++11 -Wextra -O3"
)
set
(
CMAKE_LD_FLAGS
"-lpthread"
)
ADD_EXECUTABLE
(
cppack src/core/statsgen.cpp src/cli/main.cpp
)
add_executable
(
cppack src/core/statsgen.cpp src/cli/main.cpp
)
target_link_libraries
(
cppack
${
CMAKE_THREAD_LIBS_INIT
}
)
# Création des exécutables.
...
...
@@ -40,7 +40,7 @@ if(Qt5Core_FOUND)
src/core/statsgen.cpp
)
target_link_libraries
(
cppack-gui Qt5::Core Qt5::Widgets Qt5::Charts
${
CMAKE_THREAD_LIBS_INIT
}
)
target_link_libraries
(
cppack-gui Qt5::Core
Qt5::Gui
Qt5::Widgets Qt5::Charts
${
CMAKE_THREAD_LIBS_INIT
}
)
else
()
message
(
STATUS
"Qt5 not found. Not building GUI."
)
endif
()
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Dockerfile
+
3
−
2
View file @
2511d7c4
# docker build . -t cppack
# docker run -d --name gsg -p 5022:22 cppack
# ssh -X -p 5022 root@127.0.0.1 /opt/cppack/cppack-gui
# ssh -X -p 5022 root@127.0.0.1 /opt/cppack/
bin/
cppack-gui
FROM
ubuntu:bionic
ENV
SSH_PASSWORD "rootpass"
...
...
@@ -8,6 +8,7 @@ ENV SSH_PASSWORD "rootpass"
RUN
apt-get
-qq
update
RUN
apt-get
-qq
-y
install
\
build-essential
\
cmake
\
qt5-default
\
libqt5charts5-dev
\
supervisor
\
...
...
@@ -31,7 +32,7 @@ RUN mkdir -p /var/log/supervisor && \
COPY
. /opt/cppack
WORKDIR
/opt/cppack
RUN
make
-s
RUN
cmake
.
&&
make
-s
CMD
[ "/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf" ]
...
...
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