Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drupalci_environments
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
drupalci_environments
Commits
245ea26d
Commit
245ea26d
authored
1 year ago
by
Tim Hestenes Lehnen
Browse files
Options
Downloads
Patches
Plain Diff
Fix base image for mysql-5.7 / mysql-8
#3388135
parent
e72735c1
Branches
Branches containing commit
No related tags found
1 merge request
!24
Fix base image for mysql-5.7 / mysql-8 #3388135
Pipeline
#22544
passed
1 year ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
db/mysql-5.7/Dockerfile
+3
-7
3 additions, 7 deletions
db/mysql-5.7/Dockerfile
db/mysql-5.7/conf/startup.sh
+2
-2
2 additions, 2 deletions
db/mysql-5.7/conf/startup.sh
with
5 additions
and
9 deletions
db/mysql-5.7/Dockerfile
+
3
−
7
View file @
245ea26d
FROM
mysql:5.7
FROM
docker.io/
mysql:5.7
MAINTAINER
drupalci
MAINTAINER
drupalci
# Packages.
# Packages.
RUN
apt-get
-y
update
&&
\
RUN
yum
install
-y
--setopt
=
skip_missing_names_on_install
=
False
\
apt-get
-y
install
netcat
netcat psmisc
;
yum clean all
RUN
apt-get clean
&&
apt-get autoclean
&&
apt-get
-y
autoremove
COPY
./conf/my.cnf /etc/mysql/my.cnf
COPY
./conf/my.cnf /etc/mysql/my.cnf
RUN
rm
-rf
/var/lib/mysql/
*
USER
root
USER
root
COPY
./conf/startup.sh /opt/startup.sh
COPY
./conf/startup.sh /opt/startup.sh
...
...
This diff is collapsed.
Click to expand it.
db/mysql-5.7/conf/startup.sh
+
2
−
2
View file @
245ea26d
...
@@ -5,7 +5,7 @@ if [ ! -f /var/lib/mysql/ibdata1 ];
...
@@ -5,7 +5,7 @@ if [ ! -f /var/lib/mysql/ibdata1 ];
echo
"rebuilding /var/lib/mysql/ibdata1"
echo
"rebuilding /var/lib/mysql/ibdata1"
mysqld
--initialize-insecure
--user
=
mysql
--basedir
=
/usr/
--datadir
=
/var/lib/mysql/
mysqld
--initialize-insecure
--user
=
mysql
--basedir
=
/usr/
--datadir
=
/var/lib/mysql/
test
-e
/var/run/mysqld
||
install
-m
755
-o
mysql
-g
root
-d
/var/run/mysqld
test
-e
/var/run/mysqld
||
install
-m
755
-o
mysql
-g
root
-d
/var/run/mysqld
/usr/bin/mysqld
_safe
&
/usr/
s
bin/mysqld &
PID
=
"
${
!
}
"
PID
=
"
${
!
}
"
sleep
5s
sleep
5s
while
!
netcat
-vz
localhost 3306
;
do
sleep
1
;
done
while
!
netcat
-vz
localhost 3306
;
do
sleep
1
;
done
...
@@ -16,6 +16,6 @@ if [ ! -f /var/lib/mysql/ibdata1 ];
...
@@ -16,6 +16,6 @@ if [ ! -f /var/lib/mysql/ibdata1 ];
wait
${
PID
}
wait
${
PID
}
fi
fi
/usr/bin/mysqld
_safe
;
/usr/
s
bin/mysqld
;
echo
"mysql died at
$(
date
)
"
;
echo
"mysql died at
$(
date
)
"
;
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment