Skip to content

Commit 0fe13f4

Browse files
committed
Revert "Added Tideways"
This reverts commit 1c2279f.
1 parent 2fc4b7f commit 0fe13f4

File tree

3 files changed

+6
-50
lines changed

3 files changed

+6
-50
lines changed

Dockerfile

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ ARG CI_DEPLOY_TOKEN
44
ARG VANILLA_VERSION=3.3
55
ARG ENV
66

7-
# Environment Variables
8-
ENV TIDEWAYS_SERVICE vanilla
97
ENV WEB_DOCUMENT_ROOT /vanillapp
108

119
# Get the latest release of Vanilla Forums
@@ -22,24 +20,24 @@ RUN git clone https://github.com/topcoder-platform/forums-plugins.git /tmp/forum
2220
# Remove DebugPlugin from PROD env
2321
# RUN if [ "$ENV" = "prod" ]; \
2422
# then rm -R /tmp/forums-plugins/DebugPlugin; \
25-
# fi
23+
# fi
2624

2725
# Copy the Filestack plugin
2826
RUN git clone https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-filestack-plugin /tmp/forums-plugins/Filestack
2927

30-
# Copy the Groups plugin
28+
#Copy the Groups plugin
3129
RUN git clone https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-groups-plugin /tmp/forums-plugins/Groups
3230

33-
# Copy the SumoLogic plugin
31+
#Copy the SumoLogic plugin
3432
RUN git clone https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-sumologic-plugin /tmp/forums-plugins/Sumologic
3533

36-
# Copy the TopcoderEditor plugin
34+
#Copy the TopcoderEditor plugin
3735
RUN git clone https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-topcoder-editor-plugin /tmp/forums-plugins/TopcoderEditor
3836

3937
# Copy all plugins to the Vanilla plugins folder
4038
RUN cp -r /tmp/forums-plugins/. /vanillapp/plugins
4139

42-
# Get the debug bar plugin
40+
#Get the debug bar plugin
4341
RUN wget https://us.v-cdn.net/5018160/uploads/addons/KSBIPJYMC0F2.zip
4442
RUN unzip KSBIPJYMC0F2.zip
4543
RUN cp -r debugbar /vanillapp/plugins
@@ -61,17 +59,3 @@ RUN chown application:application /vanillapp/conf/config.php
6159
RUN chmod ug=rwx,o=rx /vanillapp/conf/config.php
6260
# Clone the forum-theme repository
6361
RUN git clone 'https://github.com/topcoder-platform/forums-theme.git' /vanillapp/themes/topcoder
64-
65-
# Tideways
66-
RUN apt-get update && apt-get install -y gnupg2
67-
RUN echo 'deb https://packages.tideways.com/apt-packages debian main' > /etc/apt/sources.list.d/tideways.list && \
68-
curl -L -sS 'https://packages.tideways.com/key.gpg' | apt-key add - && \
69-
apt-get update && \
70-
DEBIAN_FRONTEND=noninteractive apt-get -yq install tideways-php && \
71-
apt-get autoremove --assume-yes && \
72-
apt-get clean && \
73-
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
74-
75-
# For customization a placeholder /opt/docker/etc/php/php.ini is available which will be loaded as last configuration file.
76-
# All settings can be overwritten in this ini file
77-
RUN echo 'extension=tideways.so\ntideways.connection=tcp://tideways-daemon:9135\ntideways.enable_cli=0\n' >> opt/docker/etc/php/php.ini

docker-compose.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,5 @@ services:
1111
- ENV
1212
- VANILLA_VERSION=3.3
1313
- CI_DEPLOY_TOKEN
14-
links:
15-
- tideways-daemon
1614
ports:
17-
- 80:80
18-
tideways-daemon:
19-
container_name: tideways-daemon
20-
build:
21-
context: ./tideways-daemon
22-
ports:
23-
- 9135:9135
15+
- 80:80

tideways-daemon/Dockerfile

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)