Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-07 18:17:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

6.15.2-6-debian-10-r104 release

Browse Source
This commit is contained in:
Bitnami Bot
2020-12-03 15:46:14 +00:00
parent 0e22245be2
commit e565a482df
4 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bitnami/ejbca/6/debian-10/Dockerfile
View File

@@ -10,7 +10,7 @@ COPY prebuildfs /
# Install required system packages and dependencies
RUN install_packages acl ca-certificates curl gzip libaio1 libaudit1 libc6 libcap-ng0 libgcc1 libicu63 libjemalloc2 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps tar zlib1g
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.275-0" --checksum 81e35af4a12129edc3d2fdd6fd7c4fab2dbdd5fba74eab6fe4576381867a55ab
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wildfly" "14.0.1-7" --checksum 44eef50002cd3c5abf3cbd1b5ba26319443b458a96a0a0912188ae381375b027
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wildfly" "14.0.1-8" --checksum d9087854ee0f282fa60e68530bc1645abae7e72bf87e74d086ae283306f9770d
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.27-0" --checksum f96905e763a6334b75a7cdb07f8d89658cde02be41cb09d91d0682fc649fdcff
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ejbca" "6.15.2-6-3" --checksum f244d0041df0394e0c4ab186a7d1769e007a90b8d2150f05aadad3f3ea573b80
@@ -22,7 +22,7 @@ COPY rootfs /
RUN /opt/bitnami/scripts/ejbca/postunpack.sh
ENV ALLOW_EMPTY_PASSWORD="no" \
BITNAMI_APP_NAME="ejbca" \
BITNAMI_IMAGE_VERSION="6.15.2-6-debian-10-r103" \
BITNAMI_IMAGE_VERSION="6.15.2-6-debian-10-r104" \
MARIADB_HOST="mariadb" \
MARIADB_PORT_NUMBER="3306" \
MARIADB_ROOT_PASSWORD="" \

4
bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
View File

@@ -29,9 +29,9 @@
},
"wildfly": {
"arch": "amd64",
"digest": "44eef50002cd3c5abf3cbd1b5ba26319443b458a96a0a0912188ae381375b027",
"digest": "d9087854ee0f282fa60e68530bc1645abae7e72bf87e74d086ae283306f9770d",
"distro": "debian-10",
"type": "NAMI",
"version": "14.0.1-7"
"version": "14.0.1-8"
}
}

56
bitnami/ejbca/6/debian-10/rootfs/opt/bitnami/scripts/libejbca.sh
View File

@@ -79,7 +79,7 @@ ejbca_wildfly_command() {
# None
#########################
wait_for_wildfly() {
retry_while wildfly_not_ready
retry_while wildfly_not_ready
}
########################
@@ -98,7 +98,6 @@ wildfly_not_ready() {
[[ "$status" =~ "running" ]] && return 0 || return 1
}
########################
# Configure Wildfly
# Globals:
@@ -110,7 +109,8 @@ wildfly_not_ready() {
#########################
ejbca_configure_wildfly() {
info "Creating data source"
ejbca_wildfly_command "data-source add --name=ejbcads --driver-name=\"mariadb-java-client-2.7.0.jar\" --connection-url=\"jdbc:mysql://${EJBCA_DATABASE_HOST}:${EJBCA_DATABASE_PORT}/${EJBCA_DATABASE_NAME}\" --jndi-name=\"java:/EjbcaDS\" --use-ccm=true --driver-class=\"org.mariadb.jdbc.Driver\" --user-name=\"${EJBCA_DATABASE_USERNAME}\" --password=\"${EJBCA_DATABASE_PASSWORD}\" --validate-on-match=true --background-validation=false --prepared-statements-cache-size=50 --share-prepared-statements=true --min-pool-size=5 --max-pool-size=150 --pool-prefill=true --transaction-isolation=TRANSACTION_READ_COMMITTED --check-valid-connection-sql=\"select 1;\""
local -r pluginJar="$(basename "$EJBCA_WILDFLY_DEPLOY_DIR"/mariadb*)"
ejbca_wildfly_command "data-source add --name=ejbcads --driver-name=\"${pluginJar}\" --connection-url=\"jdbc:mysql://${EJBCA_DATABASE_HOST}:${EJBCA_DATABASE_PORT}/${EJBCA_DATABASE_NAME}\" --jndi-name=\"java:/EjbcaDS\" --use-ccm=true --driver-class=\"org.mariadb.jdbc.Driver\" --user-name=\"${EJBCA_DATABASE_USERNAME}\" --password=\"${EJBCA_DATABASE_PASSWORD}\" --validate-on-match=true --background-validation=false --prepared-statements-cache-size=50 --share-prepared-statements=true --min-pool-size=5 --max-pool-size=150 --pool-prefill=true --transaction-isolation=TRANSACTION_READ_COMMITTED --check-valid-connection-sql=\"select 1;\""
ejbca_wildfly_command ":reload"
wait_for_wildfly
@@ -237,7 +237,6 @@ ejbca_stop_wildfly() {
ejbca_wildfly_command ":shutdown"
}
#######################
# Create wildfly management user
# Globals:
@@ -253,7 +252,6 @@ ejbca_create_management_user() {
"$EJBCA_WILDFLY_BIN_DIR"/add-user.sh -u "$EJBCA_WILDFLY_ADMIN_USER" -p "$EJBCA_WILDFLY_ADMIN_PASSWORD" -s
}
#######################
# Deploy package in wildfly
# Globals:
@@ -285,7 +283,7 @@ ejbca_wildfly_deploy() {
# None
#########################
database_not_ready() {
echo "select 1" | debug_execute mysql -u"$EJBCA_DATABASE_USERNAME" -p"$EJBCA_DATABASE_PASSWORD" -h"$EJBCA_DATABASE_HOST" -P"$EJBCA_DATABASE_PORT" "$EJBCA_DATABASE_NAME"
echo "select 1" | debug_execute mysql -u"$EJBCA_DATABASE_USERNAME" -p"$EJBCA_DATABASE_PASSWORD" -h"$EJBCA_DATABASE_HOST" -P"$EJBCA_DATABASE_PORT" "$EJBCA_DATABASE_NAME"
}
########################
@@ -304,8 +302,8 @@ ejbca_create_database() {
retry_while database_not_ready
# Create database structure
mysql -u"$EJBCA_DATABASE_USERNAME" -p"$EJBCA_DATABASE_PASSWORD" -h"$EJBCA_DATABASE_HOST" -P"$EJBCA_DATABASE_PORT" "$EJBCA_DATABASE_NAME" < "$EJBCA_DB_SCRIPT_TABLES"
mysql -u"$EJBCA_DATABASE_USERNAME" -p"$EJBCA_DATABASE_PASSWORD" -h"$EJBCA_DATABASE_HOST" -P"$EJBCA_DATABASE_PORT" "$EJBCA_DATABASE_NAME" < "$EJBCA_DB_SCRIPT_INDEXES"
mysql -u"$EJBCA_DATABASE_USERNAME" -p"$EJBCA_DATABASE_PASSWORD" -h"$EJBCA_DATABASE_HOST" -P"$EJBCA_DATABASE_PORT" "$EJBCA_DATABASE_NAME" <"$EJBCA_DB_SCRIPT_TABLES"
mysql -u"$EJBCA_DATABASE_USERNAME" -p"$EJBCA_DATABASE_PASSWORD" -h"$EJBCA_DATABASE_HOST" -P"$EJBCA_DATABASE_PORT" "$EJBCA_DATABASE_NAME" <"$EJBCA_DB_SCRIPT_INDEXES"
}
########################
@@ -326,7 +324,7 @@ ejbca_generate_ca() {
info "Generating CA"
ejbca_ca="$(ejbca_command ca listcas 2>&1)"
if ! grep -q 'CA Name: ' <<< "$ejbca_ca"; then
if ! grep -q 'CA Name: ' <<<"$ejbca_ca"; then
info "Init CA"
ejbca_command ca init \
--dn "CN=$EJBCA_CA_NAME,$EJBCA_BASE_DN" \
@@ -351,10 +349,10 @@ ejbca_generate_ca() {
fi
ejbca_ca="$(ejbca_command ca listcas 2>&1)"
if grep -q "CA Name: $EJBCA_CA_NAME" <<< "$ejbca_ca"; then
existing_management_ca="$(grep "CA Name: $EJBCA_CA_NAME" <<< "$ejbca_ca" | sed 's/.*CA Name: //g')"
if grep -q "CA Name: $EJBCA_CA_NAME" <<<"$ejbca_ca"; then
existing_management_ca="$(grep "CA Name: $EJBCA_CA_NAME" <<<"$ejbca_ca" | sed 's/.*CA Name: //g')"
if [[ "$existing_management_ca" == "$EJBCA_CA_NAME" ]]; then
if [[ "$existing_management_ca" == "$EJBCA_CA_NAME" ]]; then
end_entity_name="$instance_hostname"
if [ "$instance_hostname" == "ejbca" ]; then
@@ -443,15 +441,15 @@ ejbca_create_truststore() {
info "Load the CAs in the trustkeystore"
ejbca_ca="$(ejbca_command ca listcas 2>&1)"
if grep -q 'CA Name: ' <<< "$ejbca_ca"; then
ca_list=($(grep 'CA Name: ' <<< "$ejbca_ca" | sed 's/.*CA Name: //g'))
if grep -q 'CA Name: ' <<<"$ejbca_ca"; then
ca_list=($(grep 'CA Name: ' <<<"$ejbca_ca" | sed 's/.*CA Name: //g'))
for line in "${ca_list[@]}"; do
ejbca_command ca getcacert \
--caname "$line" \
-f "$EJBCA_TEMP_CERT" \
-der
if [ -f "$EJBCA_TEMP_CERT" ] ; then
if [ -f "$EJBCA_TEMP_CERT" ]; then
ejbca_keytool_command -alias "$line" \
-import -trustcacerts \
-file "$EJBCA_TEMP_CERT" \
@@ -478,14 +476,14 @@ ejbca_persist_keystores() {
# Persist keystores and passwords
mv "$EJBCA_TEMP_TRUSTSTORE_FILE" "$EJBCA_TRUSTSTORE_FILE"
mv "$EJBCA_TEMP_KEYSTORE_FILE" "$EJBCA_KEYSTORE_FILE"
echo "$EJBCA_KEYSTORE_PASSWORD" > "$EJBCA_KEYSTORE_PASSWORD_FILE"
echo "$EJBCA_TRUSTSTORE_PASSWORD" > "$EJBCA_TRUSTSTORE_PASSWORD_FILE"
echo "$EJBCA_WILDFLY_ADMIN_PASSWORD" > "$EJBCA_WILDFLY_ADMIN_PASSWORD_FILE"
mv "$EJBCA_TEMP_KEYSTORE_FILE" "$EJBCA_KEYSTORE_FILE"
echo "$EJBCA_KEYSTORE_PASSWORD" >"$EJBCA_KEYSTORE_PASSWORD_FILE"
echo "$EJBCA_TRUSTSTORE_PASSWORD" >"$EJBCA_TRUSTSTORE_PASSWORD_FILE"
echo "$EJBCA_WILDFLY_ADMIN_PASSWORD" >"$EJBCA_WILDFLY_ADMIN_PASSWORD_FILE"
# Provide keystores to wildfly
[[ ! -e "$EJBCA_WILDFLY_TRUSTSTORE_FILE" ]] && ln -s "$EJBCA_TRUSTSTORE_FILE" "$EJBCA_WILDFLY_TRUSTSTORE_FILE"
[[ ! -e "$EJBCA_WILDFLY_KEYSTORE_FILE" ]] && ln -s "$EJBCA_KEYSTORE_FILE" "$EJBCA_WILDFLY_KEYSTORE_FILE"
[[ ! -e "$EJBCA_WILDFLY_TRUSTSTORE_FILE" ]] && ln -s "$EJBCA_TRUSTSTORE_FILE" "$EJBCA_WILDFLY_TRUSTSTORE_FILE"
[[ ! -e "$EJBCA_WILDFLY_KEYSTORE_FILE" ]] && ln -s "$EJBCA_KEYSTORE_FILE" "$EJBCA_WILDFLY_KEYSTORE_FILE"
}
########################
@@ -513,14 +511,14 @@ ejbca_is_persisted() {
ejbca_load_persisted() {
info "Loading persisted keystore passwords"
read -r EJBCA_KEYSTORE_PASSWORD < "$EJBCA_KEYSTORE_PASSWORD_FILE"
read -r EJBCA_TRUSTSTORE_PASSWORD < "$EJBCA_TRUSTSTORE_PASSWORD_FILE"
read -r EJBCA_WILDFLY_ADMIN_PASSWORD < "$EJBCA_WILDFLY_ADMIN_PASSWORD_FILE"
read -r EJBCA_KEYSTORE_PASSWORD <"$EJBCA_KEYSTORE_PASSWORD_FILE"
read -r EJBCA_TRUSTSTORE_PASSWORD <"$EJBCA_TRUSTSTORE_PASSWORD_FILE"
read -r EJBCA_WILDFLY_ADMIN_PASSWORD <"$EJBCA_WILDFLY_ADMIN_PASSWORD_FILE"
# Provide keystores to wildfly
info "Placing widlfly keystores"
[[ ! -e "$EJBCA_WILDFLY_TRUSTSTORE_FILE" ]] && ln -s "$EJBCA_TRUSTSTORE_FILE" "$EJBCA_WILDFLY_TRUSTSTORE_FILE"
[[ ! -e "$EJBCA_WILDFLY_KEYSTORE_FILE" ]] && ln -s "$EJBCA_KEYSTORE_FILE" "$EJBCA_WILDFLY_KEYSTORE_FILE"
[[ ! -e "$EJBCA_WILDFLY_TRUSTSTORE_FILE" ]] && ln -s "$EJBCA_TRUSTSTORE_FILE" "$EJBCA_WILDFLY_TRUSTSTORE_FILE"
[[ ! -e "$EJBCA_WILDFLY_KEYSTORE_FILE" ]] && ln -s "$EJBCA_KEYSTORE_FILE" "$EJBCA_WILDFLY_KEYSTORE_FILE"
}
########################
@@ -533,7 +531,7 @@ ejbca_load_persisted() {
# None
#########################
ejba_set_java_opts() {
cat >> "$EJBCA_WILDFLY_STANDALONE_CONF_FILE" <<EOF
cat >>"$EJBCA_WILDFLY_STANDALONE_CONF_FILE" <<EOF
JAVA_OPTS="$JAVA_OPTS -Dhttpserver.external.privhttps=$EJBCA_HTTPS_ADVERTISED_PORT_NUMBER"
EOF
}
@@ -556,8 +554,8 @@ ejbca_initialize() {
ensure_dir_exists "$EJBCA_DATA_DIR"
if [[ -f "$EJBCA_TEMP_KEYSTORE_FILE" ]]; then rm -f "$EJBCA_TEMP_KEYSTORE_FILE" ; fi
if [[ -f "$EJBCA_TEMP_TRUSTSTORE_FILE" ]]; then rm -f "$EJBCA_TEMP_TRUSTSTORE_FILE" ; fi
if [[ -f "$EJBCA_TEMP_KEYSTORE_FILE" ]]; then rm -f "$EJBCA_TEMP_KEYSTORE_FILE"; fi
if [[ -f "$EJBCA_TEMP_TRUSTSTORE_FILE" ]]; then rm -f "$EJBCA_TEMP_TRUSTSTORE_FILE"; fi
if ! ejbca_is_persisted; then
info "Deploying EJBCA from scratch"

2
bitnami/ejbca/README.md
View File

@@ -35,7 +35,7 @@ Non-root container images add an extra layer of security and are generally recom
Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/).
* [`6`, `6-debian-10`, `6.15.2-6`, `6.15.2-6-debian-10-r103`, `latest` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ejbca/blob/6.15.2-6-debian-10-r103/6/debian-10/Dockerfile)
* [`6`, `6-debian-10`, `6.15.2-6`, `6.15.2-6-debian-10-r104`, `latest` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ejbca/blob/6.15.2-6-debian-10-r104/6/debian-10/Dockerfile)
Subscribe to project updates by watching the [bitnami/ejbca GitHub repo](https://github.com/bitnami/bitnami-docker-ejbca).