From 29d4fae266f3e0d96f2ae099444746fddeff99b8 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sat, 11 Sep 2021 01:02:30 +0000 Subject: [PATCH] fixed the id column of the log table for sqlite --- codepot/docker/Dockerfile.rocky8 | 4 ++-- codepot/docker/build-rocky8.sh | 4 ++-- codepot/etc/codepot.sqlite | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/codepot/docker/Dockerfile.rocky8 b/codepot/docker/Dockerfile.rocky8 index 4081954b..eecf4a6a 100644 --- a/codepot/docker/Dockerfile.rocky8 +++ b/codepot/docker/Dockerfile.rocky8 @@ -5,11 +5,11 @@ FROM rockylinux/rockylinux:latest RUN dnf install -y epel-release # for mysql access, include php-mysqli and perl-DBD-MYSQL -RUN dnf install -y \ +RUN dnf install -y --enablerepo=powertools \ subversion subversion-perl \ httpd php php-gd php-pdo php-ldap \ perl-Digest-SHA perl-Config-Simple \ - perl-DBD-SQLite perl-LDAP perl-Mail-Sendmail \ + perl-DBD-SQLite perl-LDAP perl-Mail-Sendmail perl-Switch \ mod_dav_svn mod_perl diffutils sqlite RUN dnf install -y php-devel subversion-devel perl-devel make diff --git a/codepot/docker/build-rocky8.sh b/codepot/docker/build-rocky8.sh index 67c323fd..ab15f708 100755 --- a/codepot/docker/build-rocky8.sh +++ b/codepot/docker/build-rocky8.sh @@ -30,9 +30,9 @@ echo "PerlSwitches -Mlib=/etc/codepot/perl" >> /etc/httpd/conf.d/perl.conf && \ sed -ri -e 's|^max_execution_time[[:space:]]*=.*$|max_execution_time = 120|g' /etc/php.ini -# mod_perl has dependency on perl-devel which i think is wrong. +# mod_perl from the epel repo has dependency on perl-devel. # so i can't get perl-devel removed. -dnf remove -y php-dev subversion-devel make && \ +dnf remove -y php-devel subversion-devel make gcc annobin && \ dnf autoremove -y && rm -rf /var/cache/yum/* rm -rf /root/.subversion diff --git a/codepot/etc/codepot.sqlite b/codepot/etc/codepot.sqlite index b7cc7c32..e938cd61 100644 --- a/codepot/etc/codepot.sqlite +++ b/codepot/etc/codepot.sqlite @@ -248,7 +248,7 @@ CREATE TABLE code_review ( CREATE UNIQUE INDEX code_review_index_1 ON code_review(projectid, rev, sno); CREATE TABLE log ( - id BIGINT PRIMARY KEY, + id INTEGER PRIMARY KEY AUTOINCREMENT, projectid VARCHAR(32) NOT NULL, type VARCHAR(16) NOT NULL, action VARCHAR(16) NOT NULL,