diff --git a/CAS-1.3.8.tgz b/alpine/CAS-1.3.8.tgz similarity index 100% rename from CAS-1.3.8.tgz rename to alpine/CAS-1.3.8.tgz diff --git a/alpine/Dockerfile b/alpine/Dockerfile new file mode 100644 index 0000000..fd7d68e --- /dev/null +++ b/alpine/Dockerfile @@ -0,0 +1,55 @@ +FROM alpine +MAINTAINER Benoit LORAND + +WORKDIR /root +ENV GLPI_CONFIG_DIR=/etc/glpi +ENV GLPI_VAR_DIR=/var/lib/glpi +ENV GLPI_LOG_DIR=/var/log/glpi +ENV GLPI_VERSION=9.5.1 +ENV FUSIONINVENTORY_VERSION=9.5.0+1.0 + +RUN \ +apk add \ + runit \ + php7-apache2 \ + php7 \ + mariadb-client \ + php7-pecl-apcu \ + php7-mysqli \ + php7-gd \ + php7-intl \ + php7-ldap \ + php7-xmlrpc \ + php7-exif \ + php7-zip \ + php7-bz2 \ + php7-opcache \ + php7-pear \ + php7-curl \ + php7-dom \ + php7-pdo \ + php7-json \ + php7-session \ + php7-ctype \ + php7-fileinfo \ + php7-mbstring \ + php7-simplexml \ + php7-iconv \ + php7-sodium + +COPY CAS-1.3.8.tgz /root/ +RUN pear install /root/CAS-1.3.8.tgz +COPY httpd.conf /etc/apache2 +COPY service/ /etc/service/ +COPY glpi_init.sh /root/glpi_init.sh +COPY glpi.cron /var/spool/cron/crontabs/apache +ADD https://github.com/glpi-project/glpi/releases/download/${GLPI_VERSION}/glpi-${GLPI_VERSION}.tgz /root/glpi-${GLPI_VERSION}.tgz +ADD https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi${FUSIONINVENTORY_VERSION}/fusioninventory-${FUSIONINVENTORY_VERSION}.tar.bz2 /root/fusioninventory-${FUSIONINVENTORY_VERSION}.tar.bz2 + +RUN \ +chmod a+x /root/glpi_init.sh && \ +chmod 600 /etc/crontabs/apache && \ +rm -f /var/www/html/* /root/CAS-1.3.8.tgz && \ +rm -rf /tmp/* /var/tmp/* + +ENTRYPOINT ["/sbin/runsvdir", "-P", "/etc/service"] diff --git a/alpine/docker-compose.yml b/alpine/docker-compose.yml new file mode 100644 index 0000000..ffd67f9 --- /dev/null +++ b/alpine/docker-compose.yml @@ -0,0 +1,26 @@ +version: '3.5' +services: + web: + container_name: glpi-web + build: . + restart: always + ports: + - 8089:80 + volumes: + - ./etc/:/etc/glpi/ + - ./files/:/var/lib/glpi/ + - ./log/:/var/log/glpi/ + env_file: + - ./mysql_settings.ini + depends_on: + - db + + db: + image: mysql:5.7 + container_name: glpi-db + command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci + restart: always + env_file: + - ./mysql_settings.ini + volumes: + - ./db/:/var/lib/mysql/ diff --git a/alpine/glpi.cron b/alpine/glpi.cron new file mode 100644 index 0000000..f22a190 --- /dev/null +++ b/alpine/glpi.cron @@ -0,0 +1,5 @@ +GLPI_CONFIG_DIR=/etc/glpi +GLPI_VAR_DIR=/var/lib/glpi +GLPI_LOG_DIR=/var/log/glpi + +*/1 * * * * /usr/bin/php7 /var/www/glpi/front/cron.php diff --git a/alpine/glpi_init.sh b/alpine/glpi_init.sh new file mode 100644 index 0000000..4d0c6b2 --- /dev/null +++ b/alpine/glpi_init.sh @@ -0,0 +1,85 @@ +#!/bin/sh +GLPI_TARBALL="/root/glpi-9.5.1.tgz" +FUSION_TARBALL="/root/fusioninventory-9.5.0+1.0.tar.bz2" +NORMAL='\e[39m' +RED='\e[31m' +GREEN='\e[32m' + +msglog() { + case "${1}" in + green) + TEXT_COLOR="${GREEN}" + ;; + red) + TEXT_COLOR="${RED}" + ;; + normal) + TEXT_COLOR="${NORMAL}" + ;; + esac + DATE=$(date '+%Y %b %d %H:%M:%S') + echo ${DATE} ${TEXT_COLOR}${2}${NORMAL} +} + +waiting_for_db() { +while ! mysqlshow -h db -uroot -p${MYSQL_ROOT_PASSWORD} 2>&1 | grep "^| ${MYSQL_DATABASE}" > /dev/null 2>&1 ; do + msglog red "Waiting for mysql database initilization..." + sleep 5 +done +} + +echo GLPI_CONFIG_DIR ${GLPI_CONFIG_DIR} +echo GLPI_VAR_DIR ${GLPI_VAR_DIR} +echo GLPI_LOG_DIR ${GLPI_LOG_DIR} +echo GLPI_VERSION ${GLPI_VERSION} +echo FUSIONINVENTORY_VERSION ${FUSIONINVENTORY_VERSION} + +mkdir -p /var/www/glpi +if [ -z "$(ls -A /var/www/glpi)" ] ; then + waiting_for_db + msglog red "Initialazing ${GLPI_TARBALL}..." + cd /root + tar xf ${GLPI_TARBALL} + cp -r /root/glpi/config/. /etc/glpi/. + cp -r /root/glpi/files/. /var/lib/glpi/. + rm -r /root/glpi/config /root/glpi/files + cp -r /root/glpi/. /var/www/glpi/. + cd /var/www/glpi/plugins + tar xf ${FUSION_TARBALL} + rm -r /root/glpi + mysql --host=db --user=root --password=${MYSQL_ROOT_PASSWORD} << EOF +use mysql; +GRANT SELECT ON time_zone_name TO '${MYSQL_USER}'@'%'; +EOF + cd /var/www/glpi + php bin/console db:install --config-dir=${GLPI_CONFIG_DIR} -L fr_FR -H db -d ${MYSQL_DATABASE} -u ${MYSQL_USER} -p ${MYSQL_PASSWORD} -n + php bin/console glpi:plugin:install -u glpi fusioninventory -n + php bin/console glpi:plugin:activate fusioninventory -n + rm install/install.php + chown -R apache:apache /var/www/glpi /etc/glpi /var/lib/glpi /var/log/glpi + msglog green "Initialazing complete..." +else + msglog green "GLPI is already initialized" + cd /var/www/glpi + GLPI_ACTUAL_VERSION=$(awk -F", '" '/^define\(.GLPI_VERSION/ { print $2 }' inc/define.php | sed 's/\([0-9\.]*\).*/\1/') + FUSIONINVENTORY_ACTUAL_VERSION=$(awk -F', "' '/^define \(.PLUGIN_FUSIONINVENTORY_VERSION/ { print $2 }' plugins/fusioninventory/setup.php | sed 's/\([0-9\.+]*\).*/\1/') + if [ "${GLPI_ACTUAL_VERSION}" = "${GLPI_VERSION}" -a "${FUSIONINVENTORY_ACTUAL_VERSION}" = "${FUSIONINVENTORY_VERSION}" ] ; then + msglog green "GLPI already up2date" + exit + fi + msglog red "Updating GLPI from ${GLPI_ACTUAL_VERSION} to ${GLPI_VERSION}" + waiting_for_db + php bin/console glpi:maintenance:enable -n + php bin/console glpi:plugin:deactivate fusioninventory -n + cd /root + tar xf ${GLPI_TARBALL} + rm -r glpi/config glpi/files /var/www/glpi + mv glpi /var/www/glpi + cd /var/www/glpi/plugins + tar xf ${FUSION_TARBALL} + rm /var/www/glpi/install/install.php + cd /var/www/glpi + php bin/console db:update --config-dir=${GLPI_CONFIG_DIR} -n + php bin/console glpi:maintenance:disable -n + chown -R apache:apache /var/www/glpi /etc/glpi /var/lib/glpi /var/log/glpi +fi diff --git a/alpine/httpd.conf b/alpine/httpd.conf new file mode 100644 index 0000000..eb9d6df --- /dev/null +++ b/alpine/httpd.conf @@ -0,0 +1,481 @@ +# +# This is the main Apache HTTP server configuration file. It contains the +# configuration directives that give the server its instructions. +# See for detailed information. +# In particular, see +# +# for a discussion of each configuration directive. +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# +# Configuration and logfile names: If the filenames you specify for many +# of the server's control files begin with "/" (or "drive:/" for Win32), the +# server will use that explicit path. If the filenames do *not* begin +# with "/", the value of ServerRoot is prepended -- so "logs/access_log" +# with ServerRoot set to "/usr/local/apache2" will be interpreted by the +# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" +# will be interpreted as '/logs/access_log'. + +# +# ServerTokens +# This directive configures what you return as the Server HTTP response +# Header. The default is 'Full' which sends information about the OS-Type +# and compiled in modules. +# Set to one of: Full | OS | Minor | Minimal | Major | Prod +# where Full conveys the most information, and Prod the least. +# +ServerTokens OS + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# Do not add a slash at the end of the directory path. If you point +# ServerRoot at a non-local disk, be sure to specify a local disk on the +# Mutex directive, if file-based mutexes are used. If you wish to share the +# same ServerRoot for multiple httpd daemons, you will need to change at +# least PidFile. +# +ServerRoot /var/www + +# +# Mutex: Allows you to set the mutex mechanism and mutex file directory +# for individual mutexes, or change the global defaults +# +# Uncomment and change the directory if mutexes are file-based and the default +# mutex file directory is not on a local disk or is not appropriate for some +# other reason. +# +# Mutex default:/run/apache2 + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses. +# +#Listen 12.34.56.78:80 +Listen 80 + +# +# Dynamic Shared Object (DSO) Support +# +# To be able to use the functionality of a module which was built as a DSO you +# have to place corresponding `LoadModule' lines at this location so the +# directives contained in it are actually available _before_ they are used. +# Statically compiled modules (those listed by `httpd -l') do not need +# to be loaded here. +# +# Example: +# LoadModule foo_module modules/mod_foo.so +# +#LoadModule mpm_event_module modules/mod_mpm_event.so +LoadModule mpm_prefork_module modules/mod_mpm_prefork.so +#LoadModule mpm_worker_module modules/mod_mpm_worker.so +LoadModule authn_file_module modules/mod_authn_file.so +#LoadModule authn_dbm_module modules/mod_authn_dbm.so +#LoadModule authn_anon_module modules/mod_authn_anon.so +#LoadModule authn_dbd_module modules/mod_authn_dbd.so +#LoadModule authn_socache_module modules/mod_authn_socache.so +LoadModule authn_core_module modules/mod_authn_core.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule authz_groupfile_module modules/mod_authz_groupfile.so +LoadModule authz_user_module modules/mod_authz_user.so +#LoadModule authz_dbm_module modules/mod_authz_dbm.so +#LoadModule authz_owner_module modules/mod_authz_owner.so +#LoadModule authz_dbd_module modules/mod_authz_dbd.so +LoadModule authz_core_module modules/mod_authz_core.so +LoadModule access_compat_module modules/mod_access_compat.so +LoadModule auth_basic_module modules/mod_auth_basic.so +#LoadModule auth_form_module modules/mod_auth_form.so +#LoadModule auth_digest_module modules/mod_auth_digest.so +#LoadModule allowmethods_module modules/mod_allowmethods.so +#LoadModule file_cache_module modules/mod_file_cache.so +#LoadModule cache_module modules/mod_cache.so +#LoadModule cache_disk_module modules/mod_cache_disk.so +#LoadModule cache_socache_module modules/mod_cache_socache.so +#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so +#LoadModule socache_dbm_module modules/mod_socache_dbm.so +#LoadModule socache_memcache_module modules/mod_socache_memcache.so +#LoadModule socache_redis_module modules/mod_socache_redis.so +#LoadModule watchdog_module modules/mod_watchdog.so +#LoadModule macro_module modules/mod_macro.so +#LoadModule dbd_module modules/mod_dbd.so +#LoadModule dumpio_module modules/mod_dumpio.so +#LoadModule echo_module modules/mod_echo.so +#LoadModule buffer_module modules/mod_buffer.so +#LoadModule data_module modules/mod_data.so +#LoadModule ratelimit_module modules/mod_ratelimit.so +LoadModule reqtimeout_module modules/mod_reqtimeout.so +#LoadModule ext_filter_module modules/mod_ext_filter.so +#LoadModule request_module modules/mod_request.so +#LoadModule include_module modules/mod_include.so +LoadModule filter_module modules/mod_filter.so +#LoadModule reflector_module modules/mod_reflector.so +#LoadModule substitute_module modules/mod_substitute.so +#LoadModule sed_module modules/mod_sed.so +#LoadModule charset_lite_module modules/mod_charset_lite.so +#LoadModule deflate_module modules/mod_deflate.so +LoadModule mime_module modules/mod_mime.so +LoadModule log_config_module modules/mod_log_config.so +#LoadModule log_debug_module modules/mod_log_debug.so +#LoadModule log_forensic_module modules/mod_log_forensic.so +#LoadModule logio_module modules/mod_logio.so +LoadModule env_module modules/mod_env.so +#LoadModule mime_magic_module modules/mod_mime_magic.so +#LoadModule expires_module modules/mod_expires.so +LoadModule headers_module modules/mod_headers.so +#LoadModule usertrack_module modules/mod_usertrack.so +#LoadModule unique_id_module modules/mod_unique_id.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule version_module modules/mod_version.so +#LoadModule remoteip_module modules/mod_remoteip.so +#LoadModule session_module modules/mod_session.so +#LoadModule session_cookie_module modules/mod_session_cookie.so +#LoadModule session_crypto_module modules/mod_session_crypto.so +#LoadModule session_dbd_module modules/mod_session_dbd.so +#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so +#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so +#LoadModule dialup_module modules/mod_dialup.so +#LoadModule http2_module modules/mod_http2.so +LoadModule unixd_module modules/mod_unixd.so +#LoadModule heartbeat_module modules/mod_heartbeat.so +#LoadModule heartmonitor_module modules/mod_heartmonitor.so +LoadModule status_module modules/mod_status.so +LoadModule autoindex_module modules/mod_autoindex.so +#LoadModule asis_module modules/mod_asis.so +#LoadModule info_module modules/mod_info.so +#LoadModule suexec_module modules/mod_suexec.so + + #LoadModule cgid_module modules/mod_cgid.so + + + #LoadModule cgi_module modules/mod_cgi.so + +#LoadModule vhost_alias_module modules/mod_vhost_alias.so +#LoadModule negotiation_module modules/mod_negotiation.so +LoadModule dir_module modules/mod_dir.so +#LoadModule actions_module modules/mod_actions.so +#LoadModule speling_module modules/mod_speling.so +#LoadModule userdir_module modules/mod_userdir.so +LoadModule alias_module modules/mod_alias.so +#LoadModule rewrite_module modules/mod_rewrite.so + +LoadModule negotiation_module modules/mod_negotiation.so + + +# +# If you wish httpd to run as a different user or group, you must run +# httpd as root initially and it will switch. +# +# User/Group: The name (or #number) of the user/group to run httpd as. +# It is usually good practice to create a dedicated user and group for +# running httpd, as with most system services. +# +User apache +Group apache + + + +# 'Main' server configuration +# +# The directives in this section set up the values used by the 'main' +# server, which responds to any requests that aren't handled by a +# definition. These values also provide defaults for +# any containers you may define later in the file. +# +# All of these directives may appear inside containers, +# in which case these default settings will be overridden for the +# virtual host being defined. +# + +# +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +# +ServerAdmin you@example.com + +# +# Optionally add a line containing the server version and virtual host +# name to server-generated pages (internal error documents, FTP directory +# listings, mod_status and mod_info output etc., but not CGI generated +# documents or custom error documents). +# Set to "EMail" to also include a mailto: link to the ServerAdmin. +# Set to one of: On | Off | EMail +# +ServerSignature On + +# +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explicitly to prevent problems during startup. +# +# If your host doesn't have a registered DNS name, enter its IP address here. +# +#ServerName www.example.com:80 + +# +# Deny access to the entirety of your server's filesystem. You must +# explicitly permit access to web content directories in other +# blocks below. +# + + AllowOverride none + Require all denied + + +# +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. +# + +# +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +DocumentRoot "/var/www/glpi" + + # + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs/2.4/mod/core.html#options + # for more information. + # + Options Indexes FollowSymLinks + + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # AllowOverride FileInfo AuthConfig Limit + # + AllowOverride None + + # + # Controls who can get stuff from this server. + # + Require all granted + + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# + + DirectoryIndex index.html + + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog logs/error.log + +# +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +LogLevel warn + + + # + # The following directives define some format nicknames for use with + # a CustomLog directive (see below). + # + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + LogFormat "%h %l %u %t \"%r\" %>s %b" common + + + # You need to enable mod_logio.c to use %I and %O + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + + + # + # The location and format of the access logfile (Common Logfile Format). + # If you do not define any access logfiles within a + # container, they will be logged here. Contrariwise, if you *do* + # define per- access logfiles, transactions will be + # logged therein and *not* in this file. + # + #CustomLog logs/access.log common + + # + # If you prefer a logfile with access, agent, and referer information + # (Combined Logfile Format) you can use the following directive. + # + CustomLog logs/access.log combined + + + + # + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client + # will make a new request for the document at its new location. + # Example: + # Redirect permanent /foo http://www.example.com/bar + + # + # Alias: Maps web paths into filesystem paths and is used to + # access content that does not live under the DocumentRoot. + # Example: + # Alias /webpath /full/filesystem/path + # + # If you include a trailing / on /webpath then the server will + # require it to be present in the URL. You will also likely + # need to provide a section to allow access to + # the filesystem path. + + # + # ScriptAlias: This controls which directories contain server scripts. + # ScriptAliases are essentially the same as Aliases, except that + # documents in the target directory are treated as applications and + # run by the server when requested rather than as documents sent to the + # client. The same rules about trailing "/" apply to ScriptAlias + # directives as to Alias. + # + ScriptAlias /cgi-bin/ "/var/www/localhost/cgi-bin/" + + + + + # + # ScriptSock: On threaded servers, designate the path to the UNIX + # socket used to communicate with the CGI daemon of mod_cgid. + # + #Scriptsock cgisock + + +# +# "/var/www/localhost/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + + AllowOverride None + Options None + Require all granted + + + + # + # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied + # backend servers which have lingering "httpoxy" defects. + # 'Proxy' request header is undefined by the IETF, not listed by IANA + # + RequestHeader unset Proxy early + + + + # + # TypesConfig points to the file containing the list of mappings from + # filename extension to MIME-type. + # + TypesConfig /etc/apache2/mime.types + + # + # AddType allows you to add to or override the MIME configuration + # file specified in TypesConfig for specific file types. + # + #AddType application/x-gzip .tgz + # + # AddEncoding allows you to have certain browsers uncompress + # information on the fly. Note: Not all browsers support this. + # + #AddEncoding x-compress .Z + #AddEncoding x-gzip .gz .tgz + # + # If the AddEncoding directives above are commented-out, then you + # probably should define those extensions to indicate media types: + # + AddType application/x-compress .Z + AddType application/x-gzip .gz .tgz + + # + # AddHandler allows you to map certain file extensions to "handlers": + # actions unrelated to filetype. These can be either built into the server + # or added with the Action directive (see below) + # + # To use CGI scripts outside of ScriptAliased directories: + # (You will also need to add "ExecCGI" to the "Options" directive.) + # + #AddHandler cgi-script .cgi + + # For type maps (negotiated resources): + #AddHandler type-map var + + # + # Filters allow you to process content before it is sent to the client. + # + # To parse .shtml files for server-side includes (SSI): + # (You will also need to add "Includes" to the "Options" directive.) + # + #AddType text/html .shtml + #AddOutputFilter INCLUDES .shtml + + +# +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +# + + MIMEMagicFile /etc/apache2/magic + + +# +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# MaxRanges: Maximum number of Ranges in a request before +# returning the entire resource, or one of the special +# values 'default', 'none' or 'unlimited'. +# Default setting is to accept 200 Ranges. +#MaxRanges unlimited + +# +# EnableMMAP and EnableSendfile: On systems that support it, +# memory-mapping or the sendfile syscall may be used to deliver +# files. This usually improves server performance, but must +# be turned off when serving from networked-mounted +# filesystems or if support for these functions is otherwise +# broken on your system. +# Defaults: EnableMMAP On, EnableSendfile Off +# +#EnableMMAP off +#EnableSendfile on + +# Load config files from the config directory "/etc/apache2/conf.d". +# +IncludeOptional /etc/apache2/conf.d/*.conf diff --git a/mysql_settings.ini b/alpine/mysql_settings.ini similarity index 100% rename from mysql_settings.ini rename to alpine/mysql_settings.ini diff --git a/alpine/service/20-cron/run b/alpine/service/20-cron/run new file mode 100755 index 0000000..2fa1207 --- /dev/null +++ b/alpine/service/20-cron/run @@ -0,0 +1,7 @@ +#!/bin/sh +. /etc/service/template + +msglog green "Starting Cron..." +# Touch cron files to fix 'NUMBER OF HARD LINKS > 1' issue. See https://github.com/phusion/baseimage-docker/issues/198 +touch -c /etc/crontab /etc/cron.*/* /var/spool/cron/crontabs/* +exec /usr/sbin/crond -f -L /dev/stdout diff --git a/alpine/service/30-apache2/run b/alpine/service/30-apache2/run new file mode 100755 index 0000000..1a1a0bb --- /dev/null +++ b/alpine/service/30-apache2/run @@ -0,0 +1,5 @@ +#!/bin/sh +. /etc/service/template + +msglog green "Starting Apache..." +exec /usr/sbin/httpd -D FOREGROUND diff --git a/service/90-glpi_init/run b/alpine/service/90-glpi_init/run similarity index 100% rename from service/90-glpi_init/run rename to alpine/service/90-glpi_init/run diff --git a/service/template b/alpine/service/template similarity index 100% rename from service/template rename to alpine/service/template diff --git a/debian/CAS-1.3.8.tgz b/debian/CAS-1.3.8.tgz new file mode 100644 index 0000000..eb5c0ee Binary files /dev/null and b/debian/CAS-1.3.8.tgz differ diff --git a/Dockerfile b/debian/Dockerfile similarity index 100% rename from Dockerfile rename to debian/Dockerfile diff --git a/README.md b/debian/README.md similarity index 100% rename from README.md rename to debian/README.md diff --git a/docker-compose.yml b/debian/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to debian/docker-compose.yml diff --git a/glpi.cron b/debian/glpi.cron similarity index 100% rename from glpi.cron rename to debian/glpi.cron diff --git a/glpi_init.sh b/debian/glpi_init.sh similarity index 100% rename from glpi_init.sh rename to debian/glpi_init.sh diff --git a/debian/mysql_settings.ini b/debian/mysql_settings.ini new file mode 100644 index 0000000..b66e7ca --- /dev/null +++ b/debian/mysql_settings.ini @@ -0,0 +1,4 @@ +MYSQL_DATABASE= +MYSQL_USER= +MYSQL_PASSWORD='' +MYSQL_ROOT_PASSWORD='' diff --git a/service/20-cron/run b/debian/service/20-cron/run similarity index 100% rename from service/20-cron/run rename to debian/service/20-cron/run diff --git a/service/30-apache2/run b/debian/service/30-apache2/run similarity index 100% rename from service/30-apache2/run rename to debian/service/30-apache2/run diff --git a/debian/service/90-glpi_init/run b/debian/service/90-glpi_init/run new file mode 100755 index 0000000..767ea4b --- /dev/null +++ b/debian/service/90-glpi_init/run @@ -0,0 +1,6 @@ +#!/bin/sh +. /etc/service/template + +msglog green "Starting glpi_init.sh..." +/root/glpi_init.sh +sleep infinity diff --git a/debian/service/template b/debian/service/template new file mode 100644 index 0000000..70543c1 --- /dev/null +++ b/debian/service/template @@ -0,0 +1,19 @@ +NORMAL='\e[39m' +RED='\e[31m' +GREEN='\e[32m' + +msglog() { + case "${1}" in + green) + TEXT_COLOR="${GREEN}" + ;; + red) + TEXT_COLOR="${RED}" + ;; + normal) + TEXT_COLOR="${NORMAL}" + ;; + esac + DATE=$(date '+%Y %b %d %H:%M:%S') + echo ${DATE} ${TEXT_COLOR}${2}${NORMAL} +}