Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
docker-ci
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
UNL ITS
docker-ci
Commits
de77976e
Commit
de77976e
authored
5 months ago
by
Roger Feese
Browse files
Options
Downloads
Plain Diff
Merge branch 'add-museum-reservations-server' into 'develop'
Add new museum server See merge request
!101
parents
5ff0c1f4
389e5e90
Branches
Branches containing commit
No related tags found
2 merge requests
!102
Add new museum server
,
!101
Add new museum server
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
alpine-ssh-client/Dockerfile
+1
-0
1 addition, 0 deletions
alpine-ssh-client/Dockerfile
php-unit-test/7.2/Dockerfile
+1
-1
1 addition, 1 deletion
php-unit-test/7.2/Dockerfile
php-unit-test/7.3/Dockerfile
+1
-1
1 addition, 1 deletion
php-unit-test/7.3/Dockerfile
with
3 additions
and
2 deletions
alpine-ssh-client/Dockerfile
+
1
−
0
View file @
de77976e
...
...
@@ -36,4 +36,5 @@ RUN mkdir -p ~/.ssh && chmod 700 ~/.ssh \
its-lampinteg2.unl.edu,144.216.202.38
\
its-lampstage2.unl.edu,144.216.202.43
\
its-lampprod2.unl.edu,144.216.202.44
\
its-ads-museum-reservations1.unl.edu,144.216.202.10
\
>>
~/.ssh/known_hosts
This diff is collapsed.
Click to expand it.
php-unit-test/7.2/Dockerfile
+
1
−
1
View file @
de77976e
...
...
@@ -14,7 +14,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
RUN
apk add
--no-cache
bash nodejs nodejs-npm
$PHPIZE_DEPS
\
&&
pecl channel-update pecl.php.net
\
&&
pecl
install
xdebug-3.1.6 redis
\
&&
pecl
install
xdebug-3.1.6 redis
-6.0.2
\
&&
docker-php-ext-enable xdebug redis
\
&&
apk del
--no-cache
$PHPIZE_DEPS
RUN
curl
-o
/usr/local/bin/composer https://getcomposer.org/composer.phar
\
...
...
This diff is collapsed.
Click to expand it.
php-unit-test/7.3/Dockerfile
+
1
−
1
View file @
de77976e
...
...
@@ -15,7 +15,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
RUN
export
BUILD_DEPS
=
"bzip2-dev icu-dev libpng-dev libzip-dev openldap-dev"
\
&&
apk add
--no-cache
bash nodejs npm
$PHPIZE_DEPS
$BUILD_DEPS
\
&&
pecl channel-update pecl.php.net
\
&&
pecl
install
xdebug-3.1.6 redis
\
&&
pecl
install
xdebug-3.1.6 redis
-6.0.2
\
&&
docker-php-ext-install bz2 gd intl ldap mysqli pdo_mysql zip
\
&&
docker-php-ext-enable xdebug redis
\
&&
apk del
--no-cache
$PHPIZE_DEPS
...
...
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