mirrors/docker-icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/docker-icingaweb2.git synced 2025-10-24 13:30:59 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #116 from Icinga/debian12

Browse Source 
Bump base image version
This commit is contained in:
Eric Lippmann 2024-11-11 11:26:23 +01:00 committed by GitHub
commit 44ddf96820
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -1,6 +1,6 @@
# Icinga Web 2 Docker image | (c) 2020 Icinga GmbH | GPLv2+ # Icinga Web 2 Docker image | (c) 2020 Icinga GmbH | GPLv2+
FROM golang:bullseye as entrypoint FROM golang:bookworm as entrypoint
COPY entrypoint /entrypoint COPY entrypoint /entrypoint
@ -25,9 +25,9 @@ COPY --from=icingaweb2-git . /icingaweb2-src/.git
RUN git -C /icingaweb2-src archive --prefix=icingaweb2/ HEAD |tar -x RUN git -C /icingaweb2-src archive --prefix=icingaweb2/ HEAD |tar -x
FROM debian:bullseye-slim FROM debian:bookworm-slim
RUN ["bash", "-exo", "pipefail", "-c", "export DEBIAN_FRONTEND=noninteractive; apt-get update; apt-get install --no-install-{recommends,suggests} -y apache2 ca-certificates libapache2-mod-php7.4 libldap-common locales-all php-{imagick,redis} php7.4-{bcmath,bz2,common,curl,dba,enchant,gd,gmp,imap,interbase,intl,json,ldap,mbstring,mysql,odbc,opcache,pgsql,pspell,readline,snmp,soap,sqlite3,sybase,tidy,xml,xmlrpc,xsl,zip}; apt-get clean; rm -vrf /var/lib/apt/lists/*"] RUN ["bash", "-exo", "pipefail", "-c", "export DEBIAN_FRONTEND=noninteractive; apt-get update; apt-get install --no-install-{recommends,suggests} -y apache2 ca-certificates libapache2-mod-php8.2 libldap-common locales-all php-{imagick,redis} php8.2-{bcmath,bz2,common,curl,dba,enchant,gd,gmp,imap,interbase,intl,ldap,mbstring,mysql,odbc,opcache,pgsql,pspell,readline,snmp,soap,sqlite3,sybase,tidy,xml,xmlrpc,xsl,zip}; apt-get clean; rm -vrf /var/lib/apt/lists/*"]
COPY --from=entrypoint /entrypoint/entrypoint /entrypoint COPY --from=entrypoint /entrypoint/entrypoint /entrypoint
COPY entrypoint/db-init /entrypoint-db-init COPY entrypoint/db-init /entrypoint-db-init
@ -51,7 +51,7 @@ RUN ["install", "-o", "www-data", "-g", "www-data", "-d", "/data"]
ENTRYPOINT ["/entrypoint"] ENTRYPOINT ["/entrypoint"]
COPY --from=usr-share /usr-share/. /usr/share/ COPY --from=usr-share /usr-share/. /usr/share/
COPY php.ini /etc/php/7.4/cli/conf.d/99-docker.ini COPY php.ini /etc/php/8.2/cli/conf.d/99-docker.ini
RUN ["ln", "-vs", "/usr/share/icingaweb2/bin/icingacli", "/usr/local/bin/"] RUN ["ln", "-vs", "/usr/share/icingaweb2/bin/icingacli", "/usr/local/bin/"]
RUN ["icingacli", "setup", "config", "webserver", "apache", "--path=/", "--file=/etc/apache2/conf-enabled/icingaweb2.conf"] RUN ["icingacli", "setup", "config", "webserver", "apache", "--path=/", "--file=/etc/apache2/conf-enabled/icingaweb2.conf"]

15
entrypoint/db-init/application/clicommands/DbCommand.php
View File

@ -47,16 +47,16 @@ class DbCommand extends Command
public function initializedAction() public function initializedAction()
{ {
echo (int) (array_search('icingaweb_group', $this->getDb()->listTables(), true) !== false); echo (int) (array_search('icingaweb_group', $this->getDb()->conn->listTables(), true) !== false);
} }
public function initAction() public function initAction()
{ {
$db = $this->getDb(); $db = $this->getDb();
$db->import( $db->conn->import(
Config::module('setup') Config::module('setup')
->get('schema', 'path', Icinga::app()->getBaseDir('schema')) . "/{$db->dbType}.schema.sql" ->get('schema', 'path', Icinga::app()->getBaseDir('schema')) . "/{$db->type}.schema.sql"
); );
} }
@ -78,7 +78,7 @@ class DbCommand extends Command
} }
/** /**
* @return DbTool * @return \stdClass
*/ */
protected function getDb() protected function getDb()
{ {
@ -111,7 +111,10 @@ class DbCommand extends Command
$db = new DbTool($config); $db = new DbTool($config);
$db->connectToDb(); $db->connectToDb();
$db->dbType = $type;
return $db; return (object) [
'conn' => $db,
'type' => $type
];
} }
} }