Skip to content
This repository has been archived by the owner. It is now read-only.

Local tests show https request possible #20

Merged
1 commit merged into from
Sep 23, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ ENV MYSQL_PASSWORD "WJzesbe3poNZ91qIbmR7"
ENV ADMIN_FAMILY "admin"
ENV ADMIN_USERNAME "admin"
ENV ADMIN_NAME "admin"
ENV TERM "testterm"

# How long will we wait for MariaDB to start up?
ENV WAIT_TIME 60

Expand All @@ -130,8 +130,6 @@ RUN ln -s /opt/etc/httpd/conf.d/ports.conf /etc/httpd/conf.d/ports.conf && \
ln -s /opt/comanage/comanage-registry-1.0.5/app/webroot /var/www/html/registry && \
rm /etc/httpd/conf/httpd.conf && \
ln -s /opt/etc/httpd/conf/httpd.conf /etc/httpd/conf/httpd.conf && \
mkdir -p /opt/comanage/comanage-registry-$version/local/tmp/cache && \
chmod 777 /opt/comanage/comanage-registry-$version/local/tmp/cache && \
/opt/autoexec/bin/onbuild.sh


Expand Down
10 changes: 6 additions & 4 deletions container_files/bin/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
/opt/bin/configure_httpd.sh

/opt/bin/configure_shibd.sh

/opt/bin/configure_php.sh
log="/opt/log/start-configure.log"
set -e
echo "Configuring" > $log
/opt/bin/configure_httpd.sh >> $log
/opt/bin/configure_shibd.sh >> $log
/opt/bin/configure_php.sh >> $log



9 changes: 9 additions & 0 deletions container_files/bin/configure_php.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ else
echo "Variables are not totally filled so no configuration was performed" >> $log

fi
date >> $log
echo "Preparing for cache" >> $log
mkdir -p /opt/comanage/comanage-registry-$VERSION/local/tmp/cache/persistent && \
mkdir -p /opt/comanage/comanage-registry-$VERSION/local/tmp/cache/models && \
chmod -R 777 /opt/comanage/comanage-registry-$VERSION/local/tmp/cache && \
chown -R apache:apache /opt/comanage/comanage-registry-$VERSION/local/tmp/cache && \
echo "Cache status: " >> $log
ls -la /opt/comanage/comanage-registry-$VERSION/local/tmp/cache >> $log

date >> $log
if [ -z ${COMPOSE+x} ];then
echo "Comanage is not composed no database configuration will be perform" >> $log
Expand Down
4 changes: 0 additions & 4 deletions tests/image.bats
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,4 @@ load ../common
docker run -i $maintainer/$imagename ls -la /opt/autoexec/bin/firstrun.sh
}

@test "Cache directory created" {
docker run -i $maintainer/$imagename find /opt/comanage/comanage-registry-1.0.5/app/tmp/cache
}