Skip to content

Commit d20ddfa

Browse files
committed
Fixing build docker container python
1 parent 4e2a344 commit d20ddfa

File tree

388 files changed

+28445
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

388 files changed

+28445
-3
lines changed

Diff for: Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,10 @@ SUBDIRS = \
284284
nginx \
285285
nodejs \
286286
postgresql \
287+
python \
287288
redis \
288289
ruby \
290+
vim \
289291
application
290292

291293
all: all-recursive

Diff for: Makefile.am

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ SUBDIRS = \
44
nginx \
55
nodejs \
66
postgresql \
7+
python \
78
redis \
89
ruby \
10+
vim \
911
application

Diff for: Makefile.in

+2
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,10 @@ SUBDIRS = \
284284
nginx \
285285
nodejs \
286286
postgresql \
287+
python \
287288
redis \
288289
ruby \
290+
vim \
289291
application
290292

291293
all: all-recursive

Diff for: config.status

+3-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
393393
"
394394

395395
# Files that config.status was made for.
396-
config_files=" Makefile mariadb/Makefile mongodb/Makefile nginx/Makefile nodejs/Makefile postgresql/Makefile redis/Makefile ruby/Makefile application/Makefile"
396+
config_files=" Makefile mariadb/Makefile mongodb/Makefile nginx/Makefile nodejs/Makefile postgresql/Makefile python/Makefile redis/Makefile ruby/Makefile vim/Makefile application/Makefile"
397397

398398
ac_cs_usage="\
399399
\`$as_me' instantiates files and other configuration actions
@@ -528,8 +528,10 @@ do
528528
"nginx/Makefile") CONFIG_FILES="$CONFIG_FILES nginx/Makefile" ;;
529529
"nodejs/Makefile") CONFIG_FILES="$CONFIG_FILES nodejs/Makefile" ;;
530530
"postgresql/Makefile") CONFIG_FILES="$CONFIG_FILES postgresql/Makefile" ;;
531+
"python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;;
531532
"redis/Makefile") CONFIG_FILES="$CONFIG_FILES redis/Makefile" ;;
532533
"ruby/Makefile") CONFIG_FILES="$CONFIG_FILES ruby/Makefile" ;;
534+
"vim/Makefile") CONFIG_FILES="$CONFIG_FILES vim/Makefile" ;;
533535

534536
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
535537
esac

Diff for: configure

+3-1
Original file line numberDiff line numberDiff line change
@@ -2475,7 +2475,7 @@ $as_echo "${TAG}" >&6; }
24752475
24762476
24772477
2478-
ac_config_files="$ac_config_files Makefile mariadb/Makefile mongodb/Makefile nginx/Makefile nodejs/Makefile postgresql/Makefile redis/Makefile ruby/Makefile application/Makefile"
2478+
ac_config_files="$ac_config_files Makefile mariadb/Makefile mongodb/Makefile nginx/Makefile nodejs/Makefile postgresql/Makefile python/Makefile redis/Makefile ruby/Makefile vim/Makefile application/Makefile"
24792479
24802480
cat >confcache <<\_ACEOF
24812481
# This file is a shell script that caches the results of configure
@@ -3203,8 +3203,10 @@ do
32033203
"nginx/Makefile") CONFIG_FILES="$CONFIG_FILES nginx/Makefile" ;;
32043204
"nodejs/Makefile") CONFIG_FILES="$CONFIG_FILES nodejs/Makefile" ;;
32053205
"postgresql/Makefile") CONFIG_FILES="$CONFIG_FILES postgresql/Makefile" ;;
3206+
"python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;;
32063207
"redis/Makefile") CONFIG_FILES="$CONFIG_FILES redis/Makefile" ;;
32073208
"ruby/Makefile") CONFIG_FILES="$CONFIG_FILES ruby/Makefile" ;;
3209+
"vim/Makefile") CONFIG_FILES="$CONFIG_FILES vim/Makefile" ;;
32083210
32093211
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
32103212
esac

Diff for: configure.ac

+2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ AC_CONFIG_FILES([
4242
nginx/Makefile
4343
nodejs/Makefile
4444
postgresql/Makefile
45+
python/Makefile
4546
redis/Makefile
4647
ruby/Makefile
48+
vim/Makefile
4749
application/Makefile
4850
])
4951

Diff for: env-example

+13-1
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,16 @@ CONSUL_VIM_SERVICENAME=vim
186186
CONSUL_VIM_SERVICETAGS=dev
187187
CONSUL_VIM_SERVICEPORT=22
188188
CONSUL_VIM_CHECKTYPE=tcp
189-
VIM_PORT=2224
189+
VIM_PORT=2224
190+
191+
# ==============================================
192+
# PYTHON
193+
# ==============================================
194+
CONSUL_PYTHON_AGENT=consul
195+
# CONSUL_PYTHON_PORT=8500
196+
# CONSUL_PYTHON_KEYPREFIX=path/prefix/
197+
CONSUL_PYTHON_SERVICENAME=python
198+
CONSUL_PYTHON_SERVICETAGS=dev
199+
CONSUL_PYTHON_SERVICEPORT=22
200+
CONSUL_PYTHON_CHECKTYPE=tcp
201+
PYTHON_PORT=2225

Diff for: python/Dockerfile

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
FROM zeroc0d3lab/centos-base-workspace-lite:latest
2+
MAINTAINER ZeroC0D3 Team <[email protected]>
3+
4+
#-----------------------------------------------------------------------------
5+
# Set Environment
6+
#-----------------------------------------------------------------------------
7+
ENV PATH_HOME=/home/docker \
8+
PATH_WORKSPACE=/home/docker/workspace
9+
10+
#-----------------------------------------------------------------------------
11+
# Install Python 3.5
12+
#-----------------------------------------------------------------------------
13+
RUN yum -y install https://centos7.iuscommunity.org/ius-release.rpm \
14+
&& yum -y update \
15+
&& yum -y install python35u python35u-libs python35u-devel python35u-pip
16+
17+
#-----------------------------------------------------------------------------
18+
# Install Python 2.7
19+
#-----------------------------------------------------------------------------
20+
# RUN yum -y rpm-build \
21+
# redhat-rpm-config \
22+
# yum-utils \
23+
# && yum -y groupinstall "Development Tools" \
24+
# && sudo yum-builddep -y python-2.7.11-4.fc24.src.rpm \
25+
# && mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} \
26+
# && cd ~/rpmbuild/SRPMS \
27+
# && curl -O https://kojipkgs.fedoraproject.org//packages/python/2.7.11/4.fc24/src/python-2.7.11-4.fc24.src.rpm \
28+
# && cd ~/rpmbuild/SRPMS \
29+
# && rpmbuild --rebuild python-2.7.11-4.fc24.src.rpm \
30+
# && cd ~/rpmbuild/SPECS/ \
31+
# && sed -i -e "s/^%global run_selftest_suite 1/%global run_selftest_suite 0/g" python.spec # OPTIONAL \
32+
# && rpmbuild -ba python.spec \
33+
# && cd ~/rpmbuild/SRPMS/ \
34+
# && rpmbuild --rebuild python2711-2.7.11-4.el7.centos.src.rpm \
35+
# && cd ~/rpmbuild/RPMS/ \
36+
# && sudo yum localinstall --nogpgcheck python-libs-2.7.11-4.el7.centos.x86_64.rpm python-2.7.11-4.el7.centos.x86_64.rpm
37+
38+
#-----------------------------------------------------------------------------
39+
# Clean Up All Cache
40+
#-----------------------------------------------------------------------------
41+
RUN yum clean all
42+
43+
#-----------------------------------------------------------------------------
44+
# Set Configuration
45+
#-----------------------------------------------------------------------------
46+
COPY rootfs/ /
47+
48+
#-----------------------------------------------------------------------------
49+
# Cleanup 'root', 'opt' & 'tmp' folder
50+
#-----------------------------------------------------------------------------
51+
RUN rm -f /root/*.tar.gz \
52+
&& rm -f /root/*.zip \
53+
&& rm -f /opt/*.tar.gz \
54+
&& rm -f /opt/*.zip \
55+
&& rm -f /tmp/*.tar.gz \
56+
&& rm -f /tmp/*.zip
57+
58+
#-----------------------------------------------------------------------------
59+
# Create Workspace Application Folder
60+
#-----------------------------------------------------------------------------
61+
RUN mkdir -p ${PATH_WORKSPACE} \
62+
mkdir -p /var/run/s6
63+
64+
#-----------------------------------------------------------------------------
65+
# Fixing ownership for 'docker' user
66+
#-----------------------------------------------------------------------------
67+
RUN chown -R docker:docker ${PATH_HOME}
68+
69+
#-----------------------------------------------------------------------------
70+
# Set PORT Docker Container
71+
#-----------------------------------------------------------------------------
72+
EXPOSE 22
73+
74+
#-----------------------------------------------------------------------------
75+
# Set Volume Application
76+
#-----------------------------------------------------------------------------
77+
VOLUME [${PATH_WORKSPACE}]
78+
79+
#-----------------------------------------------------------------------------
80+
# Run Init Docker Container
81+
#-----------------------------------------------------------------------------
82+
ENTRYPOINT ["/init"]
83+
CMD []

0 commit comments

Comments
 (0)