Some housekeeping, expanding test suite

docker · Sep 8, 2016 · d7d282d · d7d282d
1 parent accd723
commit d7d282d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -21,7 +21,7 @@ RUN yum -y install --setopt=tsflags=nodocs mariadb-server bind-utils pwgen psmis
 # Add starters and installers
 ADD ./container_files /opt
 RUN rm -rf /etc/my.cnf
-COPY ./container_files/conf/my.cnf /etc
+COPY ./conf/my.cnf /etc
 # Add Volumes and Set permissions
 RUN mkdir /opt/shared && chmod 777 /opt/shared && chmod 777 /opt/bin/*.sh
 

diff --git a/container_files/conf/my.cnf → conf/my.cnf b/container_files/conf/my.cnf → conf/my.cnf
diff --git a/tests/image.bats b/tests/image.bats
@@ -9,3 +9,8 @@ load ../common
 @test "MariaDB service available" {
   docker run -i $maintainer/$imagename find /usr/lib/systemd/system/mariadb.service
 }
+
+@test "MariaDB first run consumes tmpfile" {
+  result="$(docker run -i $maintainer/$imagename find /tmp/firsttimerunning)"
+  [ "$result" != '' ]
+}