Skip to content

Commit

Permalink
updated cubrid
Browse files Browse the repository at this point in the history
  • Loading branch information
schmunk42 committed Jan 16, 2017
1 parent fb3afac commit 9954b54
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
17 changes: 6 additions & 11 deletions Dockerfile-cubrid
Original file line number Diff line number Diff line change
@@ -1,34 +1,29 @@
FROM php:5


RUN pecl install cubrid
RUN echo "extension=cubrid.so" > cubrid.ini
FROM php:5-fpm

# /usr/local/lib/php/extensions/no-debug-non-zts-20131226/cubrid.so
RUN pecl install pdo_cubrid-9.3.0.0001
RUN echo "extension=pdo_cubrid.so" > /usr/local/etc/php/conf.d/cubrid.ini


# TODO: temporary section --->
# Install system packages for composer (git)
RUN apt-get update && \
apt-get -y install \
git \
--no-install-recommends && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*



# Register the COMPOSER_HOME environment variable
ENV COMPOSER_HOME /composer

# Add global binary directory to PATH and make sure to re-export it
ENV PATH /usr/local/bin:$PATH

# Allow Composer to be run as root
ENV COMPOSER_ALLOW_SUPERUSER 1

# Install composer
RUN curl -sS https://getcomposer.org/installer | php -- \
--filename=composer.phar \
--install-dir=/usr/local/bin
# TODO: <--- end

# Project source-code
ADD ./ /project
Expand Down
4 changes: 4 additions & 0 deletions tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ Run phpunit directly
docker-compose run --rm php vendor/bin/phpunit -v --group caching,db
docker-compose run --rm php vendor/bin/phpunit -v --exclude base,caching,db,i18n,log,mutex,rbac,validators,web

### Cubrid

docker-compose run --rm php vendor/bin/phpunit -v --group cubrid

### MSSQL

**experimental**
Expand Down
5 changes: 2 additions & 3 deletions tests/docker-compose.cubrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ services:
build:
context: ..
dockerfile: Dockerfile-cubrid
#entrypoint: ['bash']
ports:
- 80
volumes:
- ../:/app
depends_on:
#- mssql
- cubrid

cubrid:
image: lighthopper/cubrid
image: lighthopper/cubrid
command: ./create-start-demodb.sh

0 comments on commit 9954b54

Please sign in to comment.