Spotter-Cluster/Spotter-VM
2
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Dockerize the lxc-build a bit more

Browse Source
This commit is contained in:
Disassembler 2018-09-12 16:08:10 +02:00
parent 939d9b0d45
commit a25186b5ea
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
17 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq/lxcfile
View File

@ -3,7 +3,7 @@ LAYER shared/alpine
LAYER shared/java
LAYER activemq/activemq
SCRIPT
RUN EOF
# Download and install ActiveMQ
wget http://archive.apache.org/dist/activemq/5.15.5/apache-activemq-5.15.5-bin.tar.gz -O - | tar xzf - -C /srv
mv /srv/apache-activemq-5.15.5 /srv/activemq
@ -16,7 +16,7 @@ SCRIPT
# Configure Java heap size
sed -i "s/-Xms64M -Xmx1G/-Xms32M -Xmx256M/" /srv/activemq/bin/env
RUN
EOF
COPY lxc

4
basic-runtimes/alpine.lxcfile
View File

@ -1,6 +1,6 @@
IMAGE build
LAYER shared/alpine
SCRIPT
RUN EOF
apk --no-cache add s6
RUN
EOF

4
basic-runtimes/java.lxcfile
View File

@ -2,6 +2,6 @@ IMAGE build
LAYER shared/alpine
LAYER shared/java
SCRIPT
RUN EOF
apk --no-cache add openjdk8-jre-base
RUN
EOF

4
basic-runtimes/libxml.lxcfile
View File

@ -2,6 +2,6 @@ IMAGE build
LAYER shared/alpine
LAYER shared/libxml
SCRIPT
RUN EOF
apk --no-cache add libxml2 libxslt
RUN
EOF

4
basic-runtimes/nodejs.lxcfile
View File

@ -2,6 +2,6 @@ IMAGE build
LAYER shared/alpine
LAYER shared/nodejs
SCRIPT
RUN EOF
apk --no-cache add nodejs
RUN
EOF

4
basic-runtimes/php.lxcfile
View File

@ -2,6 +2,6 @@ IMAGE build
LAYER shared/alpine
LAYER shared/php
SCRIPT
RUN EOF
apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session
RUN
EOF

4
basic-runtimes/python2.lxcfile
View File

@ -3,6 +3,6 @@ LAYER shared/alpine
LAYER shared/libxml
LAYER shared/python2
SCRIPT
RUN EOF
apk --no-cache add python2
RUN
EOF

4
basic-runtimes/python3.lxcfile
View File

@ -3,7 +3,7 @@ LAYER shared/alpine
LAYER shared/libxml
LAYER shared/python3
SCRIPT
RUN EOF
apk --no-cache add python3
ln -s /usr/bin/python3 /usr/bin/python
RUN
EOF

4
basic-runtimes/ruby.lxcfile
View File

@ -2,7 +2,7 @@ IMAGE build
LAYER shared/alpine
LAYER shared/ruby
SCRIPT
RUN EOF
# Install Ruby runtime dependencies
apk --no-cache add gdbm libressl readline zlib
@ -35,4 +35,4 @@ SCRIPT
rm -r /usr/src/ruby
apk --no-cache del .deps
rm -rf /root/.gem
RUN
EOF

4
basic-runtimes/tomcat.lxcfile
View File

@ -3,7 +3,7 @@ LAYER shared/alpine
LAYER shared/java
LAYER shared/tomcat
SCRIPT
RUN EOF
# Install Tomcat 8
wget http://mirror.hosting90.cz/apache/tomcat/tomcat-8/v8.0.53/bin/apache-tomcat-8.0.53.tar.gz -O - | tar xzf - -C /srv
mv /srv/apache-tomcat-8.0.53 /srv/tomcat
@ -13,6 +13,6 @@ SCRIPT
# Cleanup
rm -rf /srv/tomcat/webapps/ROOT /srv/tomcat/webapps/docs /srv/tomcat/webapps/examples /srv/tomcat/webapps/host-manager /srv/tomcat/webapps/manager
RUN
EOF
COPY lxc-tomcat

5
build-all.sh
View File

@ -3,8 +3,9 @@ set -e
SOURCE_DIR=$(realpath $(dirname "${0}"))
# Alias lxc-build
alias lxc-build=${SOURCE_DIR}/lxc-build
# Install build scripts
cp ${SOURCE_DIR}/zz-extra/lxc-build /usr/bin/lxc-build
cp ${SOURCE_DIR}/zz-extra/fix-apk /usr/bin/fix-apk
# Build basic Alpine LXC image
mkdir -p /var/lib/lxc/shared/alpine

4
ckan-datapusher/lxcfile
View File

@ -4,7 +4,7 @@ LAYER shared/libxml
LAYER shared/python2
LAYER ckan-datapusher/ckan-datapusher
SCRIPT
RUN EOF
# Install runtime dependencies
apk --no-cache add libffi libressl uwsgi-python
@ -33,7 +33,7 @@ SCRIPT
apk --no-cache del .deps
find /srv/ckan-datapusher/src -name '.git*' -exec rm -rf {} +
rm -rf /root/.cache
RUN
EOF
COPY lxc

4
ckan/lxcfile
View File

@ -4,7 +4,7 @@ LAYER shared/libxml
LAYER shared/python2
LAYER ckan/ckan
SCRIPT
RUN EOF
# Add edge/testing repository
echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
@ -49,7 +49,7 @@ SCRIPT
apk --no-cache del .deps
find /srv/ckan/src -name '.git*' -exec rm -rf {} +
rm -rf /root/.cache
RUN
EOF
MOUNT /srv/ckan/conf etc/ckan
MOUNT /srv/ckan/data srv/ckan/storage

4
postgres/lxcfile
View File

@ -2,7 +2,7 @@ IMAGE postgres
LAYER shared/alpine
LAYER postgres/postgres
SCRIPT
RUN EOF
# Modify OS user (which will be picked up later by apk add)
sed -i 's/postgres:x:70:70/postgres:x:5432:5432/' /etc/passwd
sed -i 's/postgres:x:70/postgres:x:5432/' /etc/group
@ -16,7 +16,7 @@ SCRIPT
# Create socket directory
mkdir /run/postgresql
chown postgres:postgres /run/postgresql
RUN
EOF
MOUNT /srv/postgres/data var/lib/postgresql

4
redis/lxcfile
View File

@ -2,14 +2,14 @@ IMAGE redis
LAYER shared/alpine
LAYER redis/redis
SCRIPT
RUN EOF
# Create OS user (which will be picked up later by apk add)
addgroup -S -g 6379 redis
adduser -S -u 6379 -h /var/lib/redis -s /bin/false -g redis -G redis redis
# Install Redis
apk --no-cache add redis
RUN
EOF
MOUNT /srv/redis/conf/redis.conf etc/redis.conf
MOUNT /srv/redis/data var/lib/redis

4
solr/lxcfile
View File

@ -3,7 +3,7 @@ LAYER shared/alpine
LAYER shared/java
LAYER solr/solr
SCRIPT
RUN EOF
# Install runtime dependencies
apk --no-cache add bash lsof
@ -19,7 +19,7 @@ SCRIPT
# Make start/stop script visible globally (also defines directory for solr.in.sh)
ln -s /opt/solr/bin/solr /usr/bin/solr
RUN
EOF
COPY lxc

40
lxc-build → zz-extra/lxc-build
View File

@ -27,6 +27,7 @@ lxc.mount.entry = /etc/resolv.conf etc/resolv.conf none bind 0 0
lxc.init.cmd = {cmd}
lxc.init.uid = {uid}
lxc.init.gid = {gid}
lxc.init.cwd = {cwd}
# Environment
{env}
@ -55,6 +56,7 @@ class LXCImage:
self.uid = 0
self.gid = 0
self.cmd = '/bin/true'
self.cwd = '/'
if os.path.isfile(build_path):
self.lxcfile = os.path.realpath(build_path)
@ -67,22 +69,24 @@ class LXCImage:
with open(self.lxcfile, 'r') as fd:
lxcfile = [l.strip() for l in fd.readlines()]
in_script = False
script = []
script_eof = None
for line in lxcfile:
if line == 'RUN':
in_script = False
if script_eof and line == script_eof:
script_eof = None
self.run_script(script)
elif in_script:
script.append(line)
elif line == 'SCRIPT':
elif line.startswith('RUN'):
script = []
in_script = True
script_eof = line.split()[1]
elif line.startswith('IMAGE'):
self.set_name(line.split()[1])
elif line.startswith('LAYER'):
self.add_layer(line.split()[1])
elif line.startswith('LAYERFIX'):
self.fix_layers(line.split()[1])
elif line.startswith('COPY'):
srcdst = line.split()
self.copy_files(srcdst[1], srcdst[2] if len(srcdst) == 3 else '')
@ -97,7 +101,9 @@ class LXCImage:
self.set_user(uidgid[1], uidgid[2])
elif line.startswith('CMD'):
self.set_cmd(' '.join(line.split()[1:]))
# Add the final layer which can be treated as nonpersistent
elif line.startswith('WORKDIR'):
self.set_cwd(line.split()[1])
# Add the final layer which can be treated as ephemeral
self.add_layer('{}/delta0'.format(self.name))
def rebuild_config(self):
@ -109,7 +115,7 @@ class LXCImage:
mount_entries = '\n'.join(['lxc.mount.entry = {} none bind 0 0'.format(m) for m in self.mounts])
env_entries = '\n'.join(['lxc.environment = {}'.format(e) for e in self.env])
with open(os.path.join(LXC_ROOT, self.name, 'config'), 'w') as fd:
fd.write(CONFIG_TEMPLATE.format(name=self.name, rootfs=rootfs_path, mounts=mount_entries, env=env_entries, uid=self.uid, gid=self.gid, cmd=self.cmd))
fd.write(CONFIG_TEMPLATE.format(name=self.name, rootfs=rootfs_path, mounts=mount_entries, env=env_entries, uid=self.uid, gid=self.gid, cmd=self.cmd, cwd=self.cwd))
def run_script(self, script):
sh = os.path.join(self.layers[-1], 'run.sh')
@ -129,6 +135,9 @@ class LXCImage:
os.makedirs(layer, 0o755, True)
self.rebuild_config()
def fix_layers(self, cmd):
subprocess.run([cmd]+self.layers, check=True)
def copy_files(self, src, dst):
src = os.path.join(self.build_dir, src)
dst = os.path.join(self.layers[-1], dst)
@ -151,6 +160,10 @@ class LXCImage:
self.cmd = cmd
self.rebuild_config()
def set_cwd(self, cwd):
self.cwd = cwd
self.rebuild_config()
def copy_tree(src, dst):
if not os.path.isdir(src):
shutil.copy2(src, dst)
@ -160,19 +173,6 @@ def copy_tree(src, dst):
copy_tree(os.path.join(src, name), os.path.join(dst, name))
shutil.copystat(src, dst)
# def fix_world():
# world_items = []
# last_world = []
# for layer in layers[:-1]:
# with open(os.path.join(layer, 'etc/apk/world'), 'r') as fd:
# last_world = fd.read().splitlines()
# world_items.extend(last_world)
# world_items = sorted(set(world_items))
# if world_items != sorted(last_world):
# os.makedirs(os.path.join(layers[-1], 'etc/apk', 0o755, True))
# with open(os.path.join(layers[-1], 'etc/apk/world'), 'w') as fd:
# fd.writelines(world_items)
if __name__ == '__main__':
if len(sys.argv) != 2:
print('Usage: lxc-build <buildpath>\n where the buildpath can be either specific lxcfile or a directory containing one')